use QuerySet in all managers

pandora/text/managers.py

@@ -2,6 +2,7 @@
 # vi:si:et:sw=4:sts=4:ts=4
 from django.db.models import Q, Manager
 
+from ox.django.query import QuerySet
 
 def parseCondition(condition, user):
     '''
@@ -92,7 +93,7 @@ def parseConditions(conditions, operator, user):
 class TextManager(Manager):
 
     def get_query_set(self):
-        return super(TextManager, self).get_query_set()
+        return QuerySet(self.model)
 
     def find(self, data, user):
         '''

pandora/text/views.py

@@ -165,7 +165,7 @@ def _order_query(qs, sort):
         if key == 'subscribers':
             qs = qs.annotate(subscribers=Sum('subscribed_users'))
     if order_by:
-        qs = qs.order_by(*order_by)
+        qs = qs.order_by(*order_by, nulls_last=True)
     qs = qs.distinct()
     return qs