diff --git a/src/apps/api/views/datasets.py b/src/apps/api/views/datasets.py
index c000278da..d1a817c24 100644
--- a/src/apps/api/views/datasets.py
+++ b/src/apps/api/views/datasets.py
@@ -21,14 +21,14 @@ class DataViewSet(ModelViewSet):
     queryset = Data.objects.all()
     filter_backends = (DjangoFilterBackend, SearchFilter)
     filter_fields = ('type', 'name', 'key', 'was_created_by_competition', 'is_public')
-    search_fields = ('name', 'description', 'key',)
+    search_fields = ('file_name', 'name', 'description', 'key', 'competition__title',)
     pagination_class = BasicPagination
 
     def get_queryset(self):
 
         if self.request.method == 'GET':
 
-            # new filters
+            # filters
             # -----------
 
             # _public = true if want to show public datasets/submissions
diff --git a/src/static/riot/competitions/editor/_competition_details.tag b/src/static/riot/competitions/editor/_competition_details.tag
index 419fddec7..a91445998 100644
--- a/src/static/riot/competitions/editor/_competition_details.tag
+++ b/src/static/riot/competitions/editor/_competition_details.tag
@@ -88,7 +88,7 @@
         </div>
         <div class="field required">
             <label>Competition Docker Image</label>
-            <input type="text" ref="docker_image" onchange="{form_updated}" value="codalab/codalab-legacy:py37">
+            <input type="text" ref="docker_image" onchange="{form_updated}">
         </div>
         <div class="field">
             <label>Competition Type</label>
diff --git a/src/static/riot/datasets/management.tag b/src/static/riot/datasets/management.tag
index 281eff368..eb6a257ed 100644
--- a/src/static/riot/datasets/management.tag
+++ b/src/static/riot/datasets/management.tag
@@ -28,17 +28,17 @@
     </button>
 
     <!-- Data Table -->
-    <table class="ui {selectable: datasets.length > 0} celled compact table">
+    <table id="datasetsTable" class="ui {selectable: datasets.length > 0} celled compact sortable table">
         <thead>
         <tr>
             <th>File Name</th>
             <th width="175px">Type</th>
             <th width="175px">Size</th>
             <th width="125px">Uploaded</th>
-            <th width="60px">In Use</th>
-            <th width="60px">Public</th>
-            <th width="50px">Delete?</th>
-            <th width="25px"></th>
+            <th width="60px" class="no-sort">In Use</th>
+            <th width="60px" class="no-sort">Public</th>
+            <th width="50px" class="no-sort">Delete?</th>
+            <th width="25px" class="no-sort"></th>
         </tr>
         </thead>
         <tbody>
@@ -226,6 +226,7 @@
         self.one("mount", function () {
             $(".ui.dropdown", self.root).dropdown()
             $(".ui.checkbox", self.root).checkbox()
+            $('#datasetsTable').tablesort()
             self.update_datasets()
         })
 
diff --git a/src/static/riot/submissions/resource_submissions.tag b/src/static/riot/submissions/resource_submissions.tag
index fa14093a0..32c8e21b1 100644
--- a/src/static/riot/submissions/resource_submissions.tag
+++ b/src/static/riot/submissions/resource_submissions.tag
@@ -19,16 +19,16 @@
     </button>
 
     <!-- Data Table -->
-    <table class="ui {selectable: submissions.length > 0} celled compact table">
+    <table id="submissionsTable" class="ui {selectable: submissions.length > 0} celled compact sortable table">
         <thead>
         <tr>
             <th>File Name</th>
             <th>Competition in</th>
             <th width="175px">Size</th>
             <th width="125px">Uploaded</th>
-            <th width="60px">Public</th>
-            <th width="50px">Delete?</th>
-            <th width="25px"></th>
+            <th width="60px" class="no-sort">Public</th>
+            <th width="50px" class="no-sort">Delete?</th>
+            <th width="25px" class="no-sort"></th>
         </tr>
         </thead>
         <tbody>
@@ -200,6 +200,7 @@
         self.one("mount", function () {
             $(".ui.dropdown", self.root).dropdown()
             $(".ui.checkbox", self.root).checkbox()
+            $('#submissionsTable').tablesort()
             self.update_submissions()
         })
 
diff --git a/src/static/riot/tasks/management.tag b/src/static/riot/tasks/management.tag
index abe2e365e..ffc76c611 100644
--- a/src/static/riot/tasks/management.tag
+++ b/src/static/riot/tasks/management.tag
@@ -15,16 +15,16 @@
         Delete Selected Tasks
     </button>
 
-    <table class="ui {selectable: tasks.length > 0} celled compact table">
+    <table id="tasksTable" class="ui {selectable: tasks.length > 0} celled compact sortable table">
         <thead>
         <tr>
             <th>Name</th>
             <th class="benchmark-row">Benchmarks</th>
             <th width="125px">Shared With</th>
             <th width="125px">Uploaded...</th>
-            <th width="50px">Public</th>
-            <th width="50px">Delete?</th>
-            <th width="25px"></th>
+            <th width="50px" class="no-sort">Public</th>
+            <th width="50px" class="no-sort">Delete?</th>
+            <th width="25px" class="no-sort"></th>
         </tr>
         </thead>
         <tbody>
@@ -257,6 +257,7 @@
         self.one("mount", function () {
             self.update_tasks()
             $(".ui.checkbox", self.root).checkbox()
+            $('#tasksTable').tablesort()
             $('.ui.search.dataset', self.root).each(function (i, item) {
                 $(item)
                     .search({