SONAR-5087 Use correct filter and field for match against name