@bender Let's just optimize/fix those annoyances later on once I've finished pagination. Then I'll merge this branch into main.