Minor structure fix for pagenavi optimizations