Fixing up some regressions around search pagination and routing