Fixed pagination issue that returned too much