routing search fixes