Yeah, that's a LOT better.
Edit - Though weirdly posting that took a while.
I suspect there are still some performance edge cases, but for me it's now 1 page in 10 takes 15 seconds to load, rest are less than a second, rather than 5 pages in 10 takes 2-3 minutes to load, and 5 in 10 only 15 seconds.