gvk: tweak extended search queries