Fixing usages of the page selector