SONAR-5209 Speed up issues rendering