Fix initial snapshot page view
Merge branch 'MH-637' into dev