SONAR-4304 better form of manual issue
SONAR-3755 slight refactoring