diff --git a/modules/backend/behaviors/ReorderController.php b/modules/backend/behaviors/ReorderController.php
index fd7cd4c6d..aa74496d7 100644
--- a/modules/backend/behaviors/ReorderController.php
+++ b/modules/backend/behaviors/ReorderController.php
@@ -211,16 +211,20 @@ class ReorderController extends ControllerBehavior
      */
     protected function getRecords()
     {
-        $model = $this->controller->reorderGetModel();
         $records = null;
+        $model = $this->controller->reorderGetModel();
+        $query = $model->newQuery();
+
+        $this->controller->reorderExtendQuery($query);
 
         if ($this->sortMode == 'simple') {
-            $records = $model->orderBy($model->getSortOrderColumn());
-            $this->controller->reorderExtendQuery($records);
-            $records = $records->get();
+            $records = $query
+                ->orderBy($model->getSortOrderColumn())
+                ->get()
+            ;
         }
         elseif ($this->sortMode == 'nested') {
-            $records = $model->getEagerRoot();
+            $records = $query->getNested();
         }
 
         return $records;
diff --git a/modules/cms/widgets/mediamanager/assets/js/mediamanager-browser-min.js b/modules/cms/widgets/mediamanager/assets/js/mediamanager-browser-min.js
index ecd451f7e..4adbb77ae 100644
--- a/modules/cms/widgets/mediamanager/assets/js/mediamanager-browser-min.js
+++ b/modules/cms/widgets/mediamanager/assets/js/mediamanager-browser-min.js
@@ -300,8 +300,7 @@ MediaManager.prototype.showUploadUi=function(){this.$el.find('[data-control="upl
 MediaManager.prototype.hideUploadUi=function(){this.$el.find('[data-control="upload-ui"]').addClass('hide')}
 MediaManager.prototype.uploadUpdateTotalProgress=function(uploadProgress,totalBytes,totalBytesSent){this.setUploadProgress(uploadProgress)
 var fileNumberLabel=this.$el.get(0).querySelector('[data-label="file-number-and-progress"]'),messageTemplate=fileNumberLabel.getAttribute('data-message-template'),fileNumber=this.dropzone.getUploadingFiles().length+this.dropzone.getQueuedFiles().length
-if(uploadProgress>=100)
-uploadProgress=99
+if(uploadProgress>=100){uploadProgress=99}
 fileNumberLabel.innerHTML=messageTemplate.replace(':number',fileNumber).replace(':percents',Math.round(uploadProgress)+'%')}
 MediaManager.prototype.setUploadProgress=function(value){var progressBar=this.$el.get(0).querySelector('[data-control="upload-progress-bar"]')
 progressBar.setAttribute('style','width: '+value+'%')
diff --git a/modules/cms/widgets/mediamanager/assets/js/mediamanager.js b/modules/cms/widgets/mediamanager/assets/js/mediamanager.js
index 386c9609e..1a35280b9 100644
--- a/modules/cms/widgets/mediamanager/assets/js/mediamanager.js
+++ b/modules/cms/widgets/mediamanager/assets/js/mediamanager.js
@@ -764,12 +764,13 @@
             messageTemplate = fileNumberLabel.getAttribute('data-message-template'),
             fileNumber = this.dropzone.getUploadingFiles().length + this.dropzone.getQueuedFiles().length
 
-        // Don't confuse users with displaying 100% 
+        // Don't confuse users with displaying 100%
         // until the operation finishes. We consider the operation
-        // finished when the Dropzone's 'compete' event triggers - 
+        // finished when the Dropzone's 'compete' event triggers -
         // when the response is received from the server.
-        if (uploadProgress >= 100)
+        if (uploadProgress >= 100) {
             uploadProgress = 99
+        }
 
         fileNumberLabel.innerHTML = messageTemplate.replace(':number', fileNumber).replace(':percents', Math.round(uploadProgress) + '%')
     }
@@ -808,12 +809,11 @@
     }
 
     MediaManager.prototype.uploadSuccess = function() {
-      this.updateUploadBar('success', 'progress-bar progress-bar-success');
+        this.updateUploadBar('success', 'progress-bar progress-bar-success');
     }
 
     MediaManager.prototype.uploadError = function(file, message) {
-      this.updateUploadBar('error', 'progress-bar progress-bar-danger');
-
+        this.updateUploadBar('error', 'progress-bar progress-bar-danger');
         $.oc.alert('Error uploading file')
     }