Adding more service type checks, only displaying what applies to the selected service.