Added support for Services Search.
Reformatting.