pagination fixes and others