Fixed some pagination in other areas