Tweaks to reserved query vars for #2057
More tweaks to reserved query vars for #2057