Fix #2299 by not allowing $top to return more results than max page size.
Increase max page size for good measure :)