diff --git a/web/client/api/geofence/RuleService.js b/web/client/api/geofence/RuleService.js
index 5238140f09..a376f0a42d 100644
--- a/web/client/api/geofence/RuleService.js
+++ b/web/client/api/geofence/RuleService.js
@@ -43,6 +43,8 @@ const normalizeKey = (key) => {
         return 'userName';
     case 'rolename':
         return 'groupName';
+    case 'roleAny':
+        return 'groupAny';
     default:
         return key;
     }
diff --git a/web/client/components/manager/rulesmanager/rulesgrid/filterRenderers/RolesFilter.jsx b/web/client/components/manager/rulesmanager/rulesgrid/filterRenderers/RolesFilter.jsx
index dfe53cb6be..6be9c2d098 100644
--- a/web/client/components/manager/rulesmanager/rulesgrid/filterRenderers/RolesFilter.jsx
+++ b/web/client/components/manager/rulesmanager/rulesgrid/filterRenderers/RolesFilter.jsx
@@ -17,7 +17,7 @@ import { error } from '../../../../../actions/notifications';
 import { filterSelector } from '../../../../../selectors/rulesmanager';
 const selector = createSelector(filterSelector, (filter) => ({
     selected: filter.rolename,
-    anyFieldVal: filter.groupAny
+    anyFieldVal: filter.roleAny
 }));
 
 export default compose(
@@ -36,7 +36,7 @@ export default compose(
             title: "rulesmanager.errorTitle",
             message: "rulesmanager.errorLoadingRoles"
         },
-        anyFilterRuleMode: 'groupAny'
+        anyFilterRuleMode: 'roleAny'
     }),
     withHandlers({
         onValueSelected: ({column = {}, onFilterChange = () => {}}) => filterTerm => {
diff --git a/web/client/reducers/rulesmanager.js b/web/client/reducers/rulesmanager.js
index ef52c4fbe5..0522c9185d 100644
--- a/web/client/reducers/rulesmanager.js
+++ b/web/client/reducers/rulesmanager.js
@@ -108,7 +108,7 @@ function rulesmanager(state = defaultState, action) {
         const {key, value, isResetField} = action;
         if (isResetField) {
             if (key === "rolename") {
-                return assign({}, state, {filters: {...state.filters, [key]: value, ['groupAny']: undefined}});
+                return assign({}, state, {filters: {...state.filters, [key]: value, ['roleAny']: undefined}});
             } else if (key === "username") {
                 return assign({}, state, {filters: {...state.filters, [key]: value, ['userAny']: undefined}});
             }
diff --git a/web/client/selectors/__tests__/rulesmanager-test.js b/web/client/selectors/__tests__/rulesmanager-test.js
index 0002890cea..3b51ffe222 100644
--- a/web/client/selectors/__tests__/rulesmanager-test.js
+++ b/web/client/selectors/__tests__/rulesmanager-test.js
@@ -31,7 +31,7 @@ describe('test rules manager selectors', () => {
             id: 'rules1',
             priority: 1,
             roleName: 'role1',
-            groupAny: '*',
+            roleAny: '*',
             userName: '*',
             userAny: '*',
             service: '*',
diff --git a/web/client/selectors/rulesmanager.js b/web/client/selectors/rulesmanager.js
index 209fdf0be0..48a4c4ce22 100644
--- a/web/client/selectors/rulesmanager.js
+++ b/web/client/selectors/rulesmanager.js
@@ -21,7 +21,7 @@ export const rulesSelector = (state) => {
         assign(formattedRule, {'id': rule.id});
         assign(formattedRule, {'priority': rule.priority});
         assign(formattedRule, {'roleName': rule.roleName ? rule.roleName : '*'});
-        assign(formattedRule, {'groupAny': rule.groupAny ? rule.groupAny : '*'});
+        assign(formattedRule, {'roleAny': rule.roleAny ? rule.roleAny : '*'});
         assign(formattedRule, {'userName': rule.userName ? rule.userName : '*'});
         assign(formattedRule, {'userAny': rule.userAny ? rule.userAny : '*'});
         assign(formattedRule, {'service': rule.service ? rule.service : '*'});
diff --git a/web/client/themes/default/less/autocomplete.less b/web/client/themes/default/less/autocomplete.less
index 31eb94ac66..d8b496477e 100644
--- a/web/client/themes/default/less/autocomplete.less
+++ b/web/client/themes/default/less/autocomplete.less
@@ -38,6 +38,7 @@
 .rw-combobox .rw-btn {
     overflow: hidden;
 }
-.d-flex{
+.autocompleteField.d-flex{
     display: flex;
+    height: 100%;
 }