MODE-2238: Fix query result display
Merge branch 'okulikov-MODE-2238'