Changed service search utilities to use a data structure instead of a set of strings.