diff --git a/mayan/apps/documents/forms.py b/mayan/apps/documents/forms.py
index 3b04491067..a1e1af47bf 100644
--- a/mayan/apps/documents/forms.py
+++ b/mayan/apps/documents/forms.py
@@ -84,12 +84,13 @@ class DocumentForm(forms.ModelForm):
         if self.instance and self.instance.pk:
             document_type = self.instance.document_type
 
-        filenames_qs = document_type.filenames.filter(enabled=True)
-        if filenames_qs.count():
+        filenames_queryset = document_type.filenames.filter(enabled=True)
+
+        if filenames_queryset:
             self.fields[
                 'document_type_available_filenames'
             ] = forms.ModelChoiceField(
-                queryset=filenames_qs,
+                queryset=filenames_queryset,
                 required=False,
                 label=_('Quick document rename'),
                 widget=forms.Select(
diff --git a/mayan/apps/documents/managers.py b/mayan/apps/documents/managers.py
index 5a835ec83c..593448b9fa 100644
--- a/mayan/apps/documents/managers.py
+++ b/mayan/apps/documents/managers.py
@@ -47,19 +47,6 @@ class DocumentPageManager(models.Manager):
         return self.get(document_version__pk=document_version.pk, page_number=page_number)
 
 
-class DocumentVersionManager(models.Manager):
-    def get_by_natural_key(self, checksum, document_natural_key):
-        Document = apps.get_model(
-            app_label='documents', model_name='Document'
-        )
-        try:
-            document = Document.objects.get_by_natural_key(*document_natural_key)
-        except Document.DoesNotExist:
-            raise self.model.DoesNotExist
-
-        return self.get(document__pk=document.pk, checksum=checksum)
-
-
 class DocumentTypeManager(models.Manager):
     def check_delete_periods(self):
         logger.info('Executing')
@@ -127,6 +114,19 @@ class DocumentTypeManager(models.Manager):
         return self.get(label=label)
 
 
+class DocumentVersionManager(models.Manager):
+    def get_by_natural_key(self, checksum, document_natural_key):
+        Document = apps.get_model(
+            app_label='documents', model_name='Document'
+        )
+        try:
+            document = Document.objects.get_by_natural_key(*document_natural_key)
+        except Document.DoesNotExist:
+            raise self.model.DoesNotExist
+
+        return self.get(document__pk=document.pk, checksum=checksum)
+
+
 class DuplicatedDocumentManager(models.Manager):
     def clean_empty_duplicate_lists(self):
         self.filter(documents=None).delete()