Yes, agreed. Maintaining scroll position would be the best solution.