diff --git a/components/org.wso2.carbon.identity.scim2.common/src/main/java/org/wso2/carbon/identity/scim2/common/impl/SCIMUserManager.java b/components/org.wso2.carbon.identity.scim2.common/src/main/java/org/wso2/carbon/identity/scim2/common/impl/SCIMUserManager.java
index 402cf2358..3c9f3d9b3 100644
--- a/components/org.wso2.carbon.identity.scim2.common/src/main/java/org/wso2/carbon/identity/scim2/common/impl/SCIMUserManager.java
+++ b/components/org.wso2.carbon.identity.scim2.common/src/main/java/org/wso2/carbon/identity/scim2/common/impl/SCIMUserManager.java
@@ -1451,8 +1451,7 @@ private UsersGetResponse filterUsersBySingleAttribute(ExpressionNode node, Map<S
                 // Get total users based on the filter query without depending on pagination params.
                 if (SCIMCommonUtils.isGroupBasedUserFilteringImprovementsEnabled() &&
                         (isJDBCUSerStore(domainName) || isAllConfiguredUserStoresJDBC())) {
-                    // Get the total user count by the filter query.
-                    // This is only implemented for JDBC userstores.
+                    // Get the total user count by the filter query. This is only implemented for JDBC userstores.
                     totalResults += getUserCountByAttribute(node, 1, maxLimit, sortBy, sortOrder, domainName);
                 } else {
                     totalResults += filterUsers(node, 1, maxLimit, sortBy, sortOrder, domainName).size();
@@ -1468,7 +1467,7 @@ private UsersGetResponse filterUsersBySingleAttribute(ExpressionNode node, Map<S
     }
 
     /**
-     * method to get user count by filtering parameter.
+     * Get user count by filtering parameter.
      *
      * @param node       Expression node for single attribute filtering
      * @param offset     Starting index of the count
@@ -1733,7 +1732,7 @@ private Set<org.wso2.carbon.user.core.common.User> filterUsers(Node node, int of
     }
 
     /**
-     * Method to get User Count by Group filter
+     * Get user count by group filter.
      *
      * @param node       Expression or Operation node.
      * @param domainName Domain name.
@@ -1748,13 +1747,11 @@ private int getUserCountByGroup(Node node, String domainName)
         // Set filter values.
         String attributeName = ((ExpressionNode) node).getAttributeValue();
         String filterOperation = ((ExpressionNode) node).getOperation();
-        String attributeValue = ((ExpressionNode) node).getValue();
-
         /*
         If there is a domain and if the domain separator is not found in the attribute value, append the domain
         with the domain separator in front of the new attribute value.
         */
-        attributeValue = UserCoreUtil.addDomainToName(((ExpressionNode) node).getValue(), domainName);
+        String attributeValue = UserCoreUtil.addDomainToName(((ExpressionNode) node).getValue(), domainName);
 
         try {
             List<String> roleNames = getRoleNames(attributeName, filterOperation, attributeValue);