diff --git a/UI/CustomGenerator/LayerPanel.ts b/UI/CustomGenerator/LayerPanel.ts
index 3a6e1e5..bbd440c 100644
--- a/UI/CustomGenerator/LayerPanel.ts
+++ b/UI/CustomGenerator/LayerPanel.ts
@@ -20,6 +20,8 @@ import {UserDetails} from "../../Logic/Osm/OsmConnection";
 import State from "../../State";
 import {FixedUiElement} from "../Base/FixedUiElement";
 import ValidatedTextField from "../Input/ValidatedTextField";
+import {TagRendering} from "../Popup/TagRendering";
+import {Utils} from "../../Utils";
 
 /**
  * Shows the configuration for a single layer
@@ -113,18 +115,27 @@ export default class LayerPanel extends UIElement {
             description: "This is the rendering shown as title in the popup for this element",
             disableQuestions: true
         });
-        
+
         new SingleSetting(config, popupTitleRendering, ["layers", index, "title"], "Popup title", "This is the rendering shown as title in the popup");
         this.titleRendering = popupTitleRendering;
         this.registerTagRendering(popupTitleRendering);
-        
+
+
+        const renderings = config.map(config => {
+            const layer = config.layers[index] as LayerConfigJson;
+            // @ts-ignore
+            const renderings : TagRenderingConfigJson[] = layer.tagRenderings ;
+            return renderings;
+        });
         const tagRenderings = new MultiInput<TagRenderingConfigJson>("Add a tag rendering/question",
             () => ({}),
             () => {
                 const tagPanel = new TagRenderingPanel(languages, currentlySelected, userDetails)
                 self.registerTagRendering(tagPanel);
                 return tagPanel;
-            }, undefined, {allowMovement:true});
+            }, renderings,
+            {allowMovement: true});
+
         tagRenderings.GetValue().addCallback(
             tagRenderings => {
                 (config.data.layers[index] as LayerConfigJson).tagRenderings = tagRenderings;
diff --git a/UI/Input/OpeningHours/OpeningHoursInput.ts b/UI/Input/OpeningHours/OpeningHoursInput.ts
index dd83dc3..df483ed 100644
--- a/UI/Input/OpeningHours/OpeningHoursInput.ts
+++ b/UI/Input/OpeningHours/OpeningHoursInput.ts
@@ -29,7 +29,6 @@ export default class OpeningHoursInput extends InputElement<string> {
 
       
         const leftoverRules = value.map<string[]>(str => {
-            console.log("Leftovers?",str)
             if (str === undefined) {
                 return []
             }
@@ -50,7 +49,6 @@ export default class OpeningHoursInput extends InputElement<string> {
         const rulesFromOhPicker = value.map(OH.Parse);
 
         const ph = value.map<string>(str => {
-            console.log("PH RULE?", ph)
             if (str === undefined) {
                 return ""
             }
@@ -65,7 +63,6 @@ export default class OpeningHoursInput extends InputElement<string> {
         this._phSelector = new PublicHolidayInput(ph);
 
         function update() {
-            console.log("UPdating")
             let rules = OH.ToString(rulesFromOhPicker.data);
             if (leftoverRules.data.length != 0) {
                 rules += ";" + leftoverRules.data.join(";")