SONAR-5209 Fix clearing of issues