diff --git a/apps/documents/models.py b/apps/documents/models.py
index f146d9cfa1..c11253d0cc 100644
--- a/apps/documents/models.py
+++ b/apps/documents/models.py
@@ -40,6 +40,7 @@ class Document(models.Model):
     class Meta:
         verbose_name = _(u'document')
         verbose_name_plural = _(u'documents')
+        ordering = ['-date_updated', '-date_added']
         
     def __unicode__(self):
         return self.uuid
diff --git a/apps/documents/views.py b/apps/documents/views.py
index 7814a24570..170446fbe7 100644
--- a/apps/documents/views.py
+++ b/apps/documents/views.py
@@ -39,7 +39,7 @@ def document_create(request):
     return wizard(request)
 
 
-def upload_document_with_type(request, document_type_id):
+def upload_document_with_type(request, document_type_id, multiple=True):
     document_type = get_object_or_404(DocumentType, pk=document_type_id)
     if request.method == 'POST':
         form = DocumentForm(request.POST, request.FILES, initial={'document_type':document_type})
@@ -53,7 +53,10 @@ def upload_document_with_type(request, document_type_id):
                 )
                 document_metadata.save()
                 messages.success(request, _(u'Document uploaded successfully.'))
-                return HttpResponseRedirect(reverse('document_list'))
+                if multiple:
+                    return HttpResponseRedirect(request.get_full_path())
+                else:
+                    return HttpResponseRedirect(reverse('document_list'))
     else:
         form = DocumentForm(initial={'document_type':document_type})
         
diff --git a/docs/TODO b/docs/TODO
index aea674cfe0..121b3b43d2 100644
--- a/docs/TODO
+++ b/docs/TODO
@@ -4,3 +4,4 @@
 * Create indexing filesystem folders from document type metadata type
 * Validate GET data before saving file
 * Handle NULL mimetypes during model save
+* Document detail to view document metadata