fix single map query