Why not a map key -> query ?