Updated query mappings to new dictionary.