map query fix