diff --git a/docs-parent/TODO b/docs-parent/TODO
index 3c84585a..e559e087 100644
--- a/docs-parent/TODO
+++ b/docs-parent/TODO
@@ -1,2 +1,2 @@
 - Server side reordering files
-- GET /app/stats to display general data (server/client)
\ No newline at end of file
+- GET /app/stats to display general data (server/client)
diff --git a/docs-web/src/main/webapp/js/controller/DocumentEdit.js b/docs-web/src/main/webapp/js/controller/DocumentEdit.js
index 3c7c96e8..50142b77 100644
--- a/docs-web/src/main/webapp/js/controller/DocumentEdit.js
+++ b/docs-web/src/main/webapp/js/controller/DocumentEdit.js
@@ -55,7 +55,7 @@ App.controller('DocumentEdit', function($scope, $q, $http, $state, $stateParams,
       // When all files upload are over, move on
       var navigateNext = function() {
         if ($scope.isEdit()) {
-          $scope.loadDocuments();
+          $scope.pageDocuments();
           $state.transitionTo('document.view', { id: $stateParams.id });
         } else {
           $scope.document = {};
diff --git a/docs-web/src/main/webapp/partial/directive.selecttag.html b/docs-web/src/main/webapp/partial/directive.selecttag.html
index 5d74d5e9..693130e8 100644
--- a/docs-web/src/main/webapp/partial/directive.selecttag.html
+++ b/docs-web/src/main/webapp/partial/directive.selecttag.html
@@ -2,5 +2,5 @@
   <ul class="inline">
     <li ng-repeat="tag in tags"><span class="label label-info">{{ tag.name }} <span class="icon-remove icon-white" ng-click="deleteTag(tag)"></span></span></li>
   </ul>
-  <input type="text" id="{{ ref }}" placeholder="Type a tag" ng-model="input" typeahead="tag.name for tag in allTags | filter: $viewValue" typeahead-on-select="addTag()" />
+  <input type="text" id="{{ ref }}" placeholder="Type a tag" ng-model="input" autocomplete="off" typeahead="tag.name for tag in allTags | filter: $viewValue" typeahead-on-select="addTag()" />
 </div>
\ No newline at end of file
diff --git a/docs-web/src/main/webapp/partial/document.html b/docs-web/src/main/webapp/partial/document.html
index 3a3c20a9..cd619919 100644
--- a/docs-web/src/main/webapp/partial/document.html
+++ b/docs-web/src/main/webapp/partial/document.html
@@ -49,6 +49,9 @@
       <div class="text-center">
         <pagination num-pages="numPages" max-size="5" current-page="currentPage"></pagination>
       </div>
+      <div class="text-right">
+        {{ totalDocuments }} document{{ totalDocuments > 1 ? 's' : '' }} found
+      </div>
     </div>
     <div class="span8 well">
       <div ui-view="document"></div>