Updated config file search expressions to match services