Initial rebuild of CustomQueryPage for MW 1.35.9
