diff --git a/pandora/entity/models.py b/pandora/entity/models.py
index 40a343ca..2f70dea6 100644
--- a/pandora/entity/models.py
+++ b/pandora/entity/models.py
@@ -174,7 +174,7 @@ class Entity(models.Model):
                 response[key] = self.name_sort
             elif key == 'documents':
                 response[key] = [ox.toAZ(id_)
-                    for id_, in self.documentproperties.order_by('document__name_sort').values_list('document_id')]
+                    for id_, in self.documentproperties.order_by('index').values_list('document_id')]
             elif key in self.data:
                 response[key] = self.data[key]
         return response
diff --git a/pandora/oxdjango/decorators.py b/pandora/oxdjango/decorators.py
index 1feeee67..55928fb4 100644
--- a/pandora/oxdjango/decorators.py
+++ b/pandora/oxdjango/decorators.py
@@ -2,8 +2,10 @@
 # vi:si:et:sw=4:sts=4:ts=4
 from __future__ import absolute_import
 
-from functools import wraps
-
+try:
+    from django.contrib.auth.decorators import wraps
+except:
+    from django.utils.functional import wraps
 from .shortcuts import render_to_json_response
 
 def login_required_json(function=None):