Better clients search code. Added searching routing for services.