Fixed query mapping.