Index: /applications/editors/josm/plugins/toms/src/toms/dialogs/SmpDialogAction.java
===================================================================
--- /applications/editors/josm/plugins/toms/src/toms/dialogs/SmpDialogAction.java	(revision 23165)
+++ /applications/editors/josm/plugins/toms/src/toms/dialogs/SmpDialogAction.java	(revision 23166)
@@ -1141,5 +1141,4 @@
 						it = it.substring(0, i1) + it.substring(i2+1);
 					}
-System.out.println(it + " " + c);
 					if (!c.isEmpty())
 						buoy.setLightGroup(c);;
Index: /applications/editors/josm/plugins/toms/src/toms/seamarks/buoys/Buoy.java
===================================================================
--- /applications/editors/josm/plugins/toms/src/toms/seamarks/buoys/Buoy.java	(revision 23165)
+++ /applications/editors/josm/plugins/toms/src/toms/seamarks/buoys/Buoy.java	(revision 23166)
@@ -525,10 +525,15 @@
 					tmp = c.substring(i1, c.length());
 					c = c.substring(0, i1);
-				}
-				if (!getLightGroup().isEmpty())
+					if (!getLightGroup().isEmpty()) {
+						c = c + "(" + getLightGroup() + ")";
+					}
+					if (tmp != null)
+						c = c + tmp;
+				}
+				dlg.cbM01Kennung.setSelectedItem(c);
+				if ((dlg.cbM01Kennung.getSelectedIndex() == 0) && !getLightGroup().isEmpty()) {
 					c = c + "(" + getLightGroup() + ")";
-				if (tmp != null)
-					c = c + tmp;
-				dlg.cbM01Kennung.setSelectedItem(c);
+					dlg.cbM01Kennung.setSelectedItem(c);
+				}
 				c = c + " " + getLightColour();
 				lp = getLightPeriod();
@@ -539,6 +544,11 @@
 				dlg.lM01Kennung.setVisible(true);
 				dlg.cbM01Kennung.setVisible(true);
-				dlg.lM01Group.setVisible(true);
-				dlg.tfM01Group.setVisible(true);
+				if (((String)dlg.cbM01Kennung.getSelectedItem()).contains("(")) {
+					dlg.tfM01Group.setVisible(false);
+					dlg.lM01Group.setVisible(false);
+				} else {
+					dlg.lM01Group.setVisible(true);
+					dlg.tfM01Group.setVisible(true);
+				}
 				dlg.tfM01Group.setText(getLightGroup());
 				dlg.lM01RepeatTime.setVisible(true);