[ros-diffs] [jimtabor] 34296: Add two more query window types.