diff --git a/api/v1/views.py b/api/v1/views.py
index 1122282d..6f475b55 100644
--- a/api/v1/views.py
+++ b/api/v1/views.py
@@ -455,6 +455,8 @@ class UserViewSet(ExtendedModelViewSet):
                 serializer = self.get_serializer(page, many=True)
                 return self.get_paginated_response(serializer.data)
 
+        # FIXME
+        queryset = queryset[:2000]
         serializer = self.get_serializer(queryset, many=True)
         return Response(serializer.data)
 
diff --git a/apps/course/models.py b/apps/course/models.py
index 553e6c7c..e680e643 100644
--- a/apps/course/models.py
+++ b/apps/course/models.py
@@ -123,7 +123,7 @@ class Course(BaseModel, DeactivatedMixin):
         return str(self.id) + ' ' + self.title
 
     def save(self, *args, **kwargs):
-        if not self.slug:
+        if not self.slug and self.title:
             self.slug = slugify(unidecode(self.title[:90]))
         if self.slug:
             if self.slug.isdigit():
diff --git a/apps/course/views.py b/apps/course/views.py
index 5e625c42..7ac3297d 100644
--- a/apps/course/views.py
+++ b/apps/course/views.py
@@ -11,6 +11,7 @@ from django.utils.cache import add_never_cache_headers
 from django.utils.decorators import method_decorator
 from django.views.decorators.csrf import csrf_exempt
 from django.views.decorators.http import require_http_methods
+from django.utils.translation import gettext as _
 
 from apps.payment.models import AuthorBalance
 from .models import Course, Like, Lesson, CourseComment, LessonComment