diff --git a/combo_plugin_gnm/templatetags/gnm.py b/combo_plugin_gnm/templatetags/gnm.py
index 4b4c4a1..2d59708 100644
--- a/combo_plugin_gnm/templatetags/gnm.py
+++ b/combo_plugin_gnm/templatetags/gnm.py
@@ -152,6 +152,14 @@ def as_producer(slug):
         slug = slug.split(':')[0]
         if slug.startswith('_'):
             producer = slug.split('_')[1].replace('hobo-', '')
+        if slug == 'eservices':
+            # handle collectivity sites, they are individually named
+            # "eservices" but have the collectivity slug as a template
+            # variable.
+            producer = settings.TEMPLATE_VARS.get('gnm_commune', producer)
+            if settings.TEMPLATE_VARS.get('gnm_commune_name'):
+                return {'slug': producer,
+                        'label': settings.TEMPLATE_VARS.get('gnm_commune_name')}
     else:
         try:
             producer = re.search(r'(^|\W)producer-(\w*)(\W|$)', slug).group(2).strip()
@@ -161,6 +169,9 @@ def as_producer(slug):
     if settings.KNOWN_SERVICES['hobo'].get('hobo-%s' % producer):
         return {'slug': producer,
                 'label': settings.KNOWN_SERVICES['hobo'].get('hobo-%s' % producer, {'title': ''})['title']}
+    elif settings.KNOWN_SERVICES['hobo'].get('_interco_hobo-%s' % producer):
+        return {'slug': producer,
+                'label': settings.KNOWN_SERVICES['hobo'].get('_interco_hobo-%s' % producer, {'title': ''})['title']}
     elif producer in PRODUCER_LABELS:
         return {'slug': producer, 'label': PRODUCER_LABELS[producer]}
     else: