Fix some pages bugs for page types

Keywords still is broken here - updated methods no doubt