Added fix for missing previous and next routes