modify query mapping