diff --git a/superset/admin.py b/superset/admin.py
index e2317f7..95ee1c2 100644
--- a/superset/admin.py
+++ b/superset/admin.py
@@ -15,7 +15,8 @@ class SupersetExerciseInline(admin.StackedInline):
 
 @admin.register(Superset)
 class SupersetAdmin(ImportExportModelAdmin):
-    list_display = ("name", "workout", "order", "rounds", "get_workout_id", "estimated_time",)
+    search_fields = ['workout__id', 'name']
+    list_display = ("name",  "get_workout_id", "workout", "order", "rounds", "estimated_time",)
     ordering = ("order",)
     inlines = [
         SupersetExerciseInline,
diff --git a/superset/models.py b/superset/models.py
index b385426..27158c9 100644
--- a/superset/models.py
+++ b/superset/models.py
@@ -19,7 +19,8 @@ class Superset(models.Model):
     estimated_time = models.FloatField(max_length=255, blank=True, null=True)
 
     def __str__(self):
-        return self.name #+ " : " + self.description + " | by: " + self.registered_user.nick_name
+        name = " -- " if self.name is None else self.name
+        return name #+ " : " + self.description + " | by: " + self.registered_user.nick_name
     
 class SupersetExercise(models.Model):
     created_at = models.DateTimeField(auto_now_add=True)