Remove check for infinite scroll option.
more updates from @jayj.