Index: /applications/editors/josm/plugins/toms/src/toms/seamarks/buoys/Buoy.java
===================================================================
--- /applications/editors/josm/plugins/toms/src/toms/seamarks/buoys/Buoy.java	(revision 23374)
+++ /applications/editors/josm/plugins/toms/src/toms/seamarks/buoys/Buoy.java	(revision 23375)
@@ -634,4 +634,5 @@
 
 				c = getLightChar();
+				dlg.cbM01Kennung.setSelectedItem(c);
 				if (c.contains("+")) {
 					i1 = c.indexOf("+");
@@ -643,13 +644,9 @@
 					if (tmp != null)
 						c = c + tmp;
-				}
-				dlg.cbM01Kennung.setSelectedItem(c);
-				if ((dlg.cbM01Kennung.getSelectedIndex() != 0)
-						&& (!getLightGroup().isEmpty())
-						|| (((String) dlg.cbM01Kennung.getSelectedItem()).contains("("))
-						&& !(((String) dlg.cbM01Kennung.getSelectedItem()).contains("+"))) {
+					dlg.cbM01Kennung.setSelectedItem(c);
+				} else if (!getLightGroup().isEmpty())
 					c = c + "(" + getLightGroup() + ")";
+				if (dlg.cbM01Kennung.getSelectedIndex() == 0)
 					dlg.cbM01Kennung.setSelectedItem(c);
-				}
 				c = c + " " + getLightColour();
 				lp = getLightPeriod();
Index: /applications/editors/josm/plugins/toms/src/toms/seamarks/buoys/BuoyCard.java
===================================================================
--- /applications/editors/josm/plugins/toms/src/toms/seamarks/buoys/BuoyCard.java	(revision 23374)
+++ /applications/editors/josm/plugins/toms/src/toms/seamarks/buoys/BuoyCard.java	(revision 23375)
@@ -193,4 +193,6 @@
 			dlg.cM01Fired.setEnabled(true);
 			dlg.cM01Fired.setVisible(true);
+			dlg.tfM01Group.setVisible(false);
+			dlg.lM01Group.setVisible(false);
 			if (!isSectored()) {
 				dlg.cbM01Colour.setVisible(false);
Index: /applications/editors/josm/plugins/toms/src/toms/seamarks/buoys/BuoyLat.java
===================================================================
--- /applications/editors/josm/plugins/toms/src/toms/seamarks/buoys/BuoyLat.java	(revision 23374)
+++ /applications/editors/josm/plugins/toms/src/toms/seamarks/buoys/BuoyLat.java	(revision 23375)
@@ -277,7 +277,7 @@
 		refreshStyles();
 		refreshLights();
-		setLightColour();
 		parseLights(keys);
 		parseFogRadar(keys);
+		setLightColour();
 
 		dlg.cbM01CatOfMark.setSelectedIndex(getBuoyIndex());