fixed page security support after merge