Fixes to type:page filtering