Fixed issue with service type filters and template changes