map client query fix