some pagination fixes