SONAR-5209 Fix issues bulk change