diff --git a/eoptasks.py b/eoptasks.py
index 8451f44..0e9f6a4 100755
--- a/eoptasks.py
+++ b/eoptasks.py
@@ -37,6 +37,7 @@ class Server:
     def __init__(self, servername, group=''):
         self.name = servername
         self.keywords = set(re.split(r'[-_ \.]', servername + ' ' + group))
+        self.keywords.add(group)
 
         # add all possible hostname parts as keywords,
         # ex: node1.dev.entrouvert.org will add: