queryservice: sensitive mode: alternate approach

The previous approach is causing too many random changes
in the code. The new approach of deciding what the display
query should be upfront should lead to a more robust scheme.
queryservice: sensitive mode flag wiring