diff --git a/ChangeLog b/ChangeLog
index ad03d15506..ec3e65640a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,7 @@ phpMyAdmin - ChangeLog
 ======================
 
 4.4.11.0 (not yet released)
+- bug       Missing selected/entered values when editing active options in visual query builder
 
 4.4.10.0 (2015-06-17)
 - bug #4950 Issues in database selection for replication
diff --git a/js/pmd/history.js b/js/pmd/history.js
index 1577f4e338..3fdfcfd793 100644
--- a/js/pmd/history.js
+++ b/js/pmd/history.js
@@ -199,6 +199,7 @@ function history_edit(index)
         document.getElementById('query_having').style.display = 'block';
     }
     if (type == "Rename") {
+        document.getElementById('e_rename').value = history_array[index].get_obj().getrename_to();
         document.getElementById('query_rename_to').style.left =  '530px';
         document.getElementById('query_rename_to').style.top  = '130px';
         document.getElementById('query_rename_to').style.position  = 'absolute';
@@ -207,6 +208,7 @@ function history_edit(index)
         document.getElementById('query_rename_to').style.display = 'block';
     }
     if (type == "Aggregate") {
+        document.getElementById('e_operator').value = history_array[index].get_obj().get_operator();
         document.getElementById('query_Aggregate').style.left = '530px';
         document.getElementById('query_Aggregate').style.top  = '130px';
         document.getElementById('query_Aggregate').style.position  = 'absolute';
diff --git a/libraries/db_designer.lib.php b/libraries/db_designer.lib.php
index 4eef3ff781..8cf7fcacd2 100644
--- a/libraries/db_designer.lib.php
+++ b/libraries/db_designer.lib.php
@@ -1233,7 +1233,7 @@ function PMA_getAggregateQueryPanel()
     $html .= '<option value="min"> MIN </option>';
     $html .= '<option value="max"> MAX </option>';
     $html .= '<option value="avg"> AVG </option>';
-    $html .= '<option value="avg"> COUNT </option>';
+    $html .= '<option value="count"> COUNT </option>';
     $html .= '</select>';
     $html .= '</td></tr>';
     $html .= '</tbody>';