Changed queries for loading a mapping