diff --git a/artemis-hawtio/artemis-plugin/src/main/webapp/plugin/js/components/addresses.js b/artemis-hawtio/artemis-plugin/src/main/webapp/plugin/js/components/addresses.js
index d15a3a27ba..649fe059a4 100644
--- a/artemis-hawtio/artemis-plugin/src/main/webapp/plugin/js/components/addresses.js
+++ b/artemis-hawtio/artemis-plugin/src/main/webapp/plugin/js/components/addresses.js
@@ -100,8 +100,8 @@ var Artemis;
             fieldOptions: [
                 {id: 'id', name: 'ID'},
                 {id: 'name', name: 'Name'},
-                {id: 'routingTypes', name: 'Routing Types'},
-                {id: 'queueCount', name: 'Queue Count'}
+                {id: 'routing_Types', name: 'Routing Types'},
+                {id: 'queue_Count', name: 'Queue Count'}
             ],
             operationOptions: [
                 {id: 'EQUALS', name: 'Equals'},
diff --git a/artemis-hawtio/artemis-plugin/src/main/webapp/plugin/js/components/queues.js b/artemis-hawtio/artemis-plugin/src/main/webapp/plugin/js/components/queues.js
index 6c80f21d0b..ab2da29f5b 100644
--- a/artemis-hawtio/artemis-plugin/src/main/webapp/plugin/js/components/queues.js
+++ b/artemis-hawtio/artemis-plugin/src/main/webapp/plugin/js/components/queues.js
@@ -127,18 +127,18 @@ var Artemis;
             fieldOptions: [
                 {id: 'id', name: 'ID'},
                 {id: 'name', name: 'Name'},
-                {id: 'consumerId', name: 'Consumer ID'},
+                {id: 'consumer_Id', name: 'Consumer ID'},
                 {id: 'address', name: 'Address'},
                 {id: 'filter', name: 'Filter'},
-                {id: 'maxConsumers', name: 'Max Consumers'},
-                {id: 'routingType', name: 'Routing Type'},
-                {id: 'purgeOnNoConsumers', name: 'Purge On No Consumers'},
+                {id: 'max_Consumers', name: 'Max Consumers'},
+                {id: 'routing_Type', name: 'Routing Type'},
+                {id: 'purge_On_No_Consumers', name: 'Purge On No Consumers'},
                 {id: 'user', name: 'User'},
-                {id: 'messageCount', name: 'Message Count'},
-                {id: 'deliveringCount', name: 'Delivering Count'},
+                {id: 'message_Count', name: 'Message Count'},
+                {id: 'delivering_Count', name: 'Delivering Count'},
                 {id: 'paused', name: 'Paused'},
                 {id: 'temporary', name: 'Temporary'},
-                {id: 'autoCreated', name: 'Auto Created'},
+                {id: 'auto_Created', name: 'Auto Created'},
                 {id: 'rate', name: 'Rate'}
             ],
             operationOptions: [
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/view/predicate/QueueFilterPredicate.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/view/predicate/QueueFilterPredicate.java
index 101660bdd5..55379ea6b3 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/view/predicate/QueueFilterPredicate.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/view/predicate/QueueFilterPredicate.java
@@ -95,6 +95,8 @@ public class QueueFilterPredicate extends ActiveMQFilterPredicate<QueueControl>
                return matches(queue.isLastValue());
             case SCHEDULED_COUNT:
                return matches(queue.getScheduledCount());
+            case USER:
+               return matches(queue.getUser());
             default:
                return true;
          }