Abstraction of the difference between when we are showing an array or a query
Merge pull request #951 from GreatApe/gk-browser-navigation-workaround

Abstraction of the difference between when we are showing an array or a query, as per JPs review comment