fixed query in map