SONAR-5364 - Updated RuleQuery taking into account feedback