better query masks