Merge conflict. Redoing Bert's making the page filter strict