MODE-2093: Query view