Feature/enable disable query explore

Incorrectly created a PR for develop instead of 2.6.0.
This was supposed to go to release/2.6.0 so re-creating.