added pagination fixes