pagination fixes and others
Merge pull request #203 from joanneci/19736

pagination fixes and others