Query scope fixes