Fixed up routing and search infrastructure