SearchRouter - minor fixes as requested by maintainer