Fixed search for new service infrastructure.