SONAR-5718 Implement extended view