SONAR-4930 Add group name search
Fix quality flawy