Simpler way of varying UI for editable/non-editable queries

Change-Id: I9a8c8e1d6a8797ec98914805613d7bef5e315171