Refined Bugfix for missing previous and next page