diff --git a/mayan/apps/documents/migrations/0017_auto_20150714_0056.py b/mayan/apps/documents/migrations/0017_auto_20150714_0056.py
new file mode 100644
index 0000000000..e422eacf64
--- /dev/null
+++ b/mayan/apps/documents/migrations/0017_auto_20150714_0056.py
@@ -0,0 +1,26 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import models, migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('documents', '0016_auto_20150708_0325'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='document',
+            name='date_added',
+            field=models.DateTimeField(auto_now_add=True, verbose_name='Added', db_index=True),
+            preserve_default=True,
+        ),
+        migrations.AlterField(
+            model_name='documentversion',
+            name='timestamp',
+            field=models.DateTimeField(auto_now_add=True, verbose_name='Timestamp', db_index=True),
+            preserve_default=True,
+        ),
+    ]
diff --git a/mayan/apps/documents/models.py b/mayan/apps/documents/models.py
index 8f54458ba6..94ab089507 100644
--- a/mayan/apps/documents/models.py
+++ b/mayan/apps/documents/models.py
@@ -89,9 +89,9 @@ class DocumentType(models.Model):
         return document
 
     class Meta:
+        ordering = ('label',)
         verbose_name = _('Document type')
         verbose_name_plural = _('Documents types')
-        ordering = ('label',)
 
 
 @python_2_unicode_compatible
@@ -104,7 +104,7 @@ class Document(models.Model):
     document_type = models.ForeignKey(DocumentType, related_name='documents', verbose_name=_('Document type'))
     label = models.CharField(db_index=True, default=_('Uninitialized document'), max_length=255, help_text=_('The name of the document'), verbose_name=_('Label'))
     description = models.TextField(blank=True, verbose_name=_('Description'))
-    date_added = models.DateTimeField(auto_now_add=True, verbose_name=_('Added'))
+    date_added = models.DateTimeField(auto_now_add=True, db_index=True, verbose_name=_('Added'))
     language = models.CharField(choices=setting_language_choices.value, default=setting_language.value, max_length=8, verbose_name=_('Language'))
     in_trash = models.BooleanField(default=False, editable=False, verbose_name=_('In trash?'))
     deleted_date_time = models.DateTimeField(blank=True, editable=True, null=True, verbose_name=_('Date and time trashed'))
@@ -281,7 +281,7 @@ class DocumentVersion(models.Model):
         cls._post_save_hooks[order] = func
 
     document = models.ForeignKey(Document, related_name='versions', verbose_name=_('Document'))
-    timestamp = models.DateTimeField(auto_now_add=True, verbose_name=_('Timestamp'))
+    timestamp = models.DateTimeField(auto_now_add=True, db_index=True, verbose_name=_('Timestamp'))
     comment = models.TextField(blank=True, verbose_name=_('Comment'))
 
     # File related fields