Stop query button disabling query mode once it is active
Remove highlight from map when clicking on a feature