pagination fixes and enhancements