Modified will_paginate version