Converting v1 query to v2

[ChenZhu-Xie (Xiè Chén-Zhú)]

interesting, I’ll advertise for you:

somewhat related to Super fast tag/page navigator - #10 by Ego