SearchRouter enhancements