[fix] client side queries