Make prefixless query work