Index: tools/gformat.py
===================================================================
--- tools/gformat.py	(revision 10698)
+++ tools/gformat.py	(revision 10702)
@@ -98,7 +98,12 @@
 
   # Use some boring defaults
-  datadump = { 'service_proxy_normal' : False, 'service_proxy_ileiden' : False, 'service_accesspoint' : True }
+  datadump = {}
   f = open(gfile, 'r')
   datadump.update(yaml.load(f,Loader=Loader))
+  if datadump['nodetype'] == 'Hybrid':
+    defaults = { 'service_proxy_normal' : False, 'service_proxy_ileiden' : False, 'service_accesspoint' : True }
+    for (key,value) in defaults.iteritems():
+      if not datadump.has_key(key):
+        datadump[key] = value
   f.close()