fixed multi-query v3