Old new version of KVQuery