mappers: fixed query selection