More carefully adjust and maintain the count property on options

This prevents observable from incorrectly determining if a page is at the end.
List: Tweak overlapRows comments
merge
Return the original rows before overlapping was performed