diff --git a/module/tree/control.php b/module/tree/control.php
index e8fe8800ea..ff49c0c6a0 100644
--- a/module/tree/control.php
+++ b/module/tree/control.php
@@ -332,11 +332,11 @@ class tree extends control
      */
     public function ajaxGetSonModules($moduleID, $rootID = 0, $type = 'story')
     {
-        $modules = $this->dao->select('id, name')->from(TABLE_MODULE)
+        $modules = $this->dao->select('id,name,short')->from(TABLE_MODULE)
             ->where('root')->eq($rootID)
             ->andWhere('parent')->eq((int)$moduleID)
             ->andWhere('type')->eq($type)
-            ->fetchPairs();
+            ->fetchAll('id');
         die(json_encode($modules));
     }
 }
diff --git a/module/tree/js/browse.js b/module/tree/js/browse.js
index 9ff2e8ba4e..94895f6c29 100644
--- a/module/tree/js/browse.js
+++ b/module/tree/js/browse.js
@@ -6,26 +6,29 @@ function syncModule(rootID, type)
     link = createLink('tree', 'ajaxGetSonModules', 'moduleID=' + moduleID + '&rootID=' + rootID + '&type=' + type);
     $.getJSON(link, function(modules)
     {
+        if(modules.length == 0) return false;
         $('.helplink').addClass('hidden');
-        var $inputgroup = $('<div></div>').append($('.input-group .icon-remove:first').closest('.input-group').clone()).html();
-        $.each(modules, function(key, value)
+        var $inputgroup = $('<div></div>').append($('.input-group .icon-remove:first').closest('.row-table').clone()).html();
+        $.each(modules, function(key, module)
         {
-            moduleName = value;
-            $('.form-control').each(function()
+            $('.row-table').each(function()
             {
-                if(this.value == moduleName) modules[key] = null;
-                if(!this.value) $(this).parent().remove();
+               moduleName = $(this).find('input[id^=modules]').val();
+                if(moduleName == module.name) modules[key] = null;
+                if(!moduleName) $(this).closest('.row-table').remove();
             })
         });  
 
-        $.each(modules, function(key, value)
+        $.each(modules, function(key, module)
         {
-            if(value)
+            if(module)
             {
                 $('#sonModule').append($inputgroup);
-                $('#sonModule .input-group:last input').val(value);
+                $('#sonModule .row-table:last input[id^=modules]').val(module.name);
+                $('#sonModule .row-table:last input[id^=shorts]').val(module.short);
             }
         })
+        $('#sonModule').append($inputgroup);
     })
 }
 
@@ -57,14 +60,14 @@ function toggleCopy()
 
 function addItem(obj)
 {
-    var $inputgroup = $(obj).closest('.input-group');
-    $inputgroup.after($inputgroup.clone()).next('.input-group').find('input').val('');
+    var $inputgroup = $(obj).closest('.row-table');
+    $inputgroup.after($inputgroup.clone()).next('.row-table').find('input').val('');
 }
 
 function deleteItem(obj)
 {
-    if($(obj).closest('.input-group').parent().find('i.icon-remove').size() <= 1) return;
-    $(obj).closest('.input-group').remove();
+    if($(obj).closest('.row-table').parent().find('i.icon-remove').size() <= 1) return;
+    $(obj).closest('.row-table').remove();
 }
 
 $(document).ready(function()