diff --git a/lang/en_utf8/data.php b/lang/en_utf8/data.php
index c33562f8133..015c9ee505f 100644
--- a/lang/en_utf8/data.php
+++ b/lang/en_utf8/data.php
@@ -24,7 +24,7 @@ $string['availablefromdate'] = 'Available from';
 $string['availabletags'] = 'Available tags';
 $string['availabletodate'] = 'Available to';
 $string['blank'] = 'Blank';
-$string['buttons'] = 'Buttons';
+$string['buttons'] = 'Actions';
 $string['bynameondate'] = 'by $a->name - $a->date';
 $string['cancel'] = 'Cancel';
 $string['checkbox'] = 'Checkbox';
@@ -175,6 +175,7 @@ $string['numnotapproved'] = 'Pending';
 $string['numrecords'] = '$a entries';
 $string['optionaldescription'] = 'Short description (optional)';
 $string['optionalfilename'] = 'Filename (optional)';
+$string['other'] = 'Other';
 $string['overwrite'] = 'Overwrite';
 $string['pagesize'] = 'Entries per page';
 $string['participants'] = 'Participants';
diff --git a/mod/data/templates.php b/mod/data/templates.php
index 3ad7c966b29..2ec039c7661 100755
--- a/mod/data/templates.php
+++ b/mod/data/templates.php
@@ -200,7 +200,7 @@
         echo '<br />';
 
 
-        echo '<select name="fields1[]" id="availabletags" size="10" onclick="insert_field_tags(this)">';
+        echo '<select name="fields1[]" id="availabletags" size="12" onclick="insert_field_tags(this)">';
 
         $fields = get_records('data_fields', 'dataid', $data->id);
         echo '<optgroup label="'.get_string('fields', 'data').'">';
@@ -226,22 +226,27 @@
             echo '<option value="##edit##">' .get_string('edit', 'data'). ' - ##edit##</option>';
             echo '<option value="##delete##">' .get_string('delete', 'data'). ' - ##delete##</option>';
             echo '<option value="##approve##">' .get_string('approve', 'data'). ' - ##approve##</option>';
+            if ($mode != 'singletemplate') {
+                // more points to single template - not useable there
+                echo '<option value="##more##">' .get_string('more', 'data'). ' - ##more##</option>';
+                echo '<option value="##moreurl##">' .get_string('moreurl', 'data'). ' - ##moreurl##</option>';
+            }
+            echo '</optgroup>';
+            echo '<optgroup label="'.get_string('other', 'data').'">';
             echo '<option value="##timeadded##">'.get_string('timeadded', 'data'). ' - ##timeadded##</option>';
             echo '<option value="##timemodified##">'.get_string('timemodified', 'data'). ' - ##timemodified##</option>';
             echo '<option value="##user##">' .get_string('user'). ' - ##user##</option>';
             if ($mode != 'singletemplate') {
                 // more points to single template - not useable there
-                echo '<option value="##more##">' .get_string('more', 'data'). ' - ##more##</option>';
-                echo '<option value="##moreurl##">' .get_string('moreurl', 'data'). ' - ##moreurl##</option>';
                 echo '<option value="##comments##">' .get_string('comments', 'data'). ' - ##comments##</option>';
             }
             echo '</optgroup>';
         }
 
         if ($mode == 'asearchtemplate') {
-            echo '<optgroup label="'.get_string('user').'">';
-            echo '<option value="##firstname##">' .get_string('firstname'). ' - ##firstname##</option>';
-            echo '<option value="##lastname##">' .get_string('lastname'). ' - ##lastname##</option>';
+            echo '<optgroup label="'.get_string('other', 'data').'">';
+            echo '<option value="##firstname##">' .get_string('authorfirstname', 'data'). ' - ##firstname##</option>';
+            echo '<option value="##lastname##">' .get_string('authorlastname', 'data'). ' - ##lastname##</option>';
             echo '</optgroup>';
         }