[CHORE] Sorts out infinite-scrolling details