diff --git a/ifcbdb/secure/views.py b/ifcbdb/secure/views.py
index 11c6c668..c8daa9bc 100644
--- a/ifcbdb/secure/views.py
+++ b/ifcbdb/secure/views.py
@@ -57,8 +57,11 @@ def dataset_management(request):
 
     form = DatasetForm(user=request.user)
 
+    is_teams_enabled = waffle.switch_is_active("Teams")
+
     return render(request, 'secure/dataset-management.html', {
         "form": form,
+        "is_teams_enabled": is_teams_enabled,
     })
 
 
@@ -128,8 +131,20 @@ def dt_datasets(request):
 
         datasets = datasets.filter(id__in=team_datasets_ids)
 
+    is_teams_enabled = waffle.switch_is_active("Teams")
+
+    if is_teams_enabled:
+        datasets = datasets.prefetch_related("teamdataset_set__team")
+
+    data = []
+    for dataset in datasets:
+        item = dataset.teamdataset_set.first() if is_teams_enabled else None
+        team_name = item.team.name if item else ""
+
+        data.append([dataset.name, dataset.title, dataset.is_active, team_name, dataset.id])
+
     return JsonResponse({
-        "data": list(datasets.values_list("name", "title", "is_active", "id"))
+        "data": data
     })
 
 @waffle_switch('Teams')
diff --git a/ifcbdb/templates/secure/dataset-management.html b/ifcbdb/templates/secure/dataset-management.html
index ca94378e..b775632f 100644
--- a/ifcbdb/templates/secure/dataset-management.html
+++ b/ifcbdb/templates/secure/dataset-management.html
@@ -22,6 +22,7 @@
                     <th>Name</th>
                     <th>Title</th>
                     <th>Active?</th>
+                    {% if is_teams_enabled %}<th>Team</th>{% endif %}
                     <th></th>
                 </tr>
             </thead>
@@ -62,7 +63,7 @@ <h5 class="modal-title" id="datasetDeleteModalLabel">Confirm Deletion</h5>
 <script>
     $(function(){
         $('#datasets').DataTable({
-            searching: false,
+            searching: true,
             lengthChange: false,
             ajax: {
                 url: "{% url 'secure:datasets_dt' %}"
@@ -76,6 +77,7 @@ <h5 class="modal-title" id="datasetDeleteModalLabel">Confirm Deletion</h5>
                         return data ? "Yes" : "No";
                     }
                 }, // Is Active
+                {% if is_teams_enabled %}{}, // Team{% endif %}
                 { // Edit and datasets
                     targets: -1,
                     render: function ( data, type, row ) {