Re-enable per-page attribute, disable page size selector if present
Merge pull request #1843 from rashidkpc/fix/per-page

Re-enable per-page attribute, disable page size selector if present