Do you have examples of where they've been generated? The code specifically never adds a page number param for page numbers <= 1. Without seeing how they've been generated, we couldn't fix it.
With the redirect in place, those route filters aren't necessary.