SONAR-5672 Fix regression on views