diff --git a/Customizations/Layers/Bookcases.ts b/Customizations/Layers/Bookcases.ts
index 16f78d95bc..7a2311c7af 100644
--- a/Customizations/Layers/Bookcases.ts
+++ b/Customizations/Layers/Bookcases.ts
@@ -119,7 +119,10 @@ export class Bookcases extends LayerDefinition {
                     key: "ref",
                     template: "Het referentienummer is $$$",
                     renderTemplate: "Gekend als {brand} <b>{ref}</b>"
-                }
+                },
+                mappings: [
+                    {k: new And([new  Tag("brand",""), new Tag("nobrand","yes"), new Tag("ref", "")]), txt: "Maakt geen deel uit van een groter netwerk"}
+                ]
             }).OnlyShowIf(new Tag("brand","*")),
 
             new TagRenderingOptions({
diff --git a/Customizations/Questions/NameInline.ts b/Customizations/Questions/NameInline.ts
index 83458a5b75..5c9d4e69aa 100644
--- a/Customizations/Questions/NameInline.ts
+++ b/Customizations/Questions/NameInline.ts
@@ -1,5 +1,6 @@
 import {TagRenderingOptions} from "../TagRendering";
 import {And, Tag} from "../../Logic/TagsFilter";
+import {UIElement} from "../../UI/UIElement";
 
 
 export class NameInline extends TagRenderingOptions{
@@ -8,7 +9,7 @@ export class NameInline extends TagRenderingOptions{
          return string.charAt(0).toUpperCase() + string.slice(1);
     }
     
-    constructor(category: string) {
+    constructor(category: string ) {
         super({
             question: "",
 
diff --git a/Customizations/TagRendering.ts b/Customizations/TagRendering.ts
index 2be71e0290..231c820528 100644
--- a/Customizations/TagRendering.ts
+++ b/Customizations/TagRendering.ts
@@ -262,8 +262,8 @@ class TagRendering extends UIElement implements TagDependantUIElement {
         if (this._question !== undefined) {
             this._editButton = new FixedUiElement("<img class='editbutton' src='./assets/pencil.svg' alt='edit'>")
                 .onClick(() => {
-                    self._questionElement.GetValue().setData(self.CurrentValue());
                     self._editMode.setData(true);
+                    self._questionElement.ShowValue(self.CurrentValue());
                 });
         }
 
@@ -297,7 +297,6 @@ class TagRendering extends UIElement implements TagDependantUIElement {
             
             const previousTexts= [];
             for (const mapping of options.mappings) {
-                console.log(mapping);
                 if(mapping.k === null){
                     continue;
                 }
@@ -306,7 +305,6 @@ class TagRendering extends UIElement implements TagDependantUIElement {
                 }
                 previousTexts.push(mapping.txt);
                 
-                console.log("PUshed")
                 elements.push(this.InputElementForMapping(mapping));
             }
         }
@@ -349,8 +347,8 @@ class TagRendering extends UIElement implements TagDependantUIElement {
                     return tag;
                 }
                 return new And([
-                        freeform.extraTags,
-                        tag
+                        tag,
+                        freeform.extraTags
                     ]
                 );
             };
@@ -362,7 +360,6 @@ class TagRendering extends UIElement implements TagDependantUIElement {
                 } else if (tag instanceof Tag) {
                     return tag.value
                 }
-                console.log("Could not decode tag to string", tag)
                 return undefined;
             }
 
@@ -392,10 +389,11 @@ class TagRendering extends UIElement implements TagDependantUIElement {
     }
 
     private CurrentValue(): TagsFilter {
+        console.log("Creating a current value...")
         const tags = TagUtils.proprtiesToKV(this._source.data);
 
         for (const oneOnOneElement of this._mapping.concat(this._renderMapping)) {
-            if (oneOnOneElement.k === null || oneOnOneElement.k.matches(tags)) {
+            if (oneOnOneElement.k !== null && oneOnOneElement.k.matches(tags)) {
                 return oneOnOneElement.k;
             }
         }
@@ -403,6 +401,7 @@ class TagRendering extends UIElement implements TagDependantUIElement {
             return undefined;
         }
 
+        console.log("Got a freeform tag:", new Tag(this._freeform.key, this._source.data[this._freeform.key]))
         return new Tag(this._freeform.key, this._source.data[this._freeform.key]);
     }
 
@@ -469,7 +468,7 @@ class TagRendering extends UIElement implements TagDependantUIElement {
             return "<div class='question'>" +
                 "<span class='question-text'>" + this._question + "</span>" +
                 (this._question !== "" ? "<br/>" : "") +
-                this._questionElement.Render() +
+               "<div>"+ this._questionElement.Render() +"</div>"+
                 this._skipButton.Render() +
                 this._saveButton.Render() +
                 "</div>"
diff --git a/UI/Input/FixedInputElement.ts b/UI/Input/FixedInputElement.ts
index d3ea566f97..0cada259e9 100644
--- a/UI/Input/FixedInputElement.ts
+++ b/UI/Input/FixedInputElement.ts
@@ -17,13 +17,19 @@ export class FixedInputElement<T> extends InputElement<T> {
     GetValue(): UIEventSource<T> {
         return this.value;
     }
+    
+    ShowValue(t: T): boolean {
+        return false;
+    }
 
-    protected InnerRender(): string {
+    InnerRender(): string {
         return this.rendering.Render();
     }
 
     IsValid(t: T): boolean {
-        return t === this.value.data;
+        return t == this.value.data;
     }
+    
+    
 
 }
\ No newline at end of file
diff --git a/UI/Input/InputElement.ts b/UI/Input/InputElement.ts
index 62e0969bc3..20d3c45587 100644
--- a/UI/Input/InputElement.ts
+++ b/UI/Input/InputElement.ts
@@ -7,5 +7,7 @@ export abstract class InputElement<T> extends UIElement{
     abstract GetValue() : UIEventSource<T>;
     
     abstract IsValid(t: T) : boolean;
+    
+    abstract ShowValue(t: T) : boolean;
 
 }
\ No newline at end of file
diff --git a/UI/Input/InputElementWrapper.ts b/UI/Input/InputElementWrapper.ts
index 979a712dfb..905a9481ca 100644
--- a/UI/Input/InputElementWrapper.ts
+++ b/UI/Input/InputElementWrapper.ts
@@ -25,6 +25,10 @@ export class InputElementWrapper<T> extends InputElement<T>{
     GetValue(): UIEventSource<T> {
         return this.input.GetValue();
     }
+    
+    ShowValue(t: T) {
+        return this.input.ShowValue(t);
+    }
 
     InnerRender(): string {
         return this.pre.Render() + this.input.Render() + this.post.Render();
diff --git a/UI/Input/RadioButton.ts b/UI/Input/RadioButton.ts
index 647fda12ac..3cec9c6496 100644
--- a/UI/Input/RadioButton.ts
+++ b/UI/Input/RadioButton.ts
@@ -31,7 +31,7 @@ export class RadioButton<T> extends InputElement<T> {
         ;
 
         this.value.addCallback((t) => {
-            self.SetCorrectValue(t);
+            self.ShowValue(t);
         })
 
 
@@ -79,11 +79,13 @@ export class RadioButton<T> extends InputElement<T> {
         return "<form id='" + this.id + "-form'>" + body + "</form>";
     }
 
-    private SetCorrectValue(t: T) {
+    public ShowValue(t: T): boolean {
         if (t === undefined) {
-            return;
+            return false;
+        }
+        if (!this.IsValid(t)) {
+            return false;
         }
-        console.log("Trying to find an option for", t)
         // We check that what is selected matches the previous rendering
         for (let i = 0; i < this._elements.length; i++) {
             const e = this._elements[i];
@@ -119,9 +121,15 @@ export class RadioButton<T> extends InputElement<T> {
                 checkButtons();
             }
         );
-
-        if (this._selectFirstAsDefault) {
-            this.SetCorrectValue(this.value.data);
+        if (this._selectedElementIndex.data !== null) {
+            const el = document.getElementById(this.IdFor(this._selectedElementIndex.data));
+            if (el) {
+                // @ts-ignore
+                el.checked = true;
+                checkButtons();
+            }
+        } else if (this._selectFirstAsDefault) {
+            this.ShowValue(this.value.data);
             if (this._selectedElementIndex.data === null || this._selectedElementIndex.data === undefined) {
                 const el = document.getElementById(this.IdFor(0));
                 if (el) {
diff --git a/UI/Input/TextField.ts b/UI/Input/TextField.ts
index 090dc45226..bc1d857cc9 100644
--- a/UI/Input/TextField.ts
+++ b/UI/Input/TextField.ts
@@ -60,7 +60,14 @@ export class TextField<T> extends InputElement<T> {
         return this.mappedValue;
     }
 
-     InnerRender(): string {
+    ShowValue(t: T): boolean {
+        if (!this.IsValid(t)) {
+            return false;
+        }
+        this.mappedValue.setData(t);
+    }
+
+    InnerRender(): string {
         return "<form onSubmit='return false' class='form-text-field'>" +
             "<input type='text' placeholder='" + this._placeholder.InnerRender() + "' id='text-" + this.id + "'>" +
             "</form>";
@@ -68,7 +75,7 @@ export class TextField<T> extends InputElement<T> {
 
     InnerUpdate(htmlElement: HTMLElement) {
         const field = document.getElementById('text-' + this.id);
-        if(field === null){
+        if (field === null) {
             return;
         }
         const self = this;
@@ -84,10 +91,16 @@ export class TextField<T> extends InputElement<T> {
             }
         });
 
+        if (this.IsValid(this.mappedValue.data)) {
+            // @ts-ignore
+            field.value = this._toString(this.mappedValue.data);
+        }
+
 
     }
 
     IsValid(t: T): boolean {
+        console.log("TXT IS valid?",t,this._toString(t))
         if(t === undefined || t === null){
             return false;
         }
diff --git a/UI/UIEventSource.ts b/UI/UIEventSource.ts
index 1e4aeb5647..54902a0891 100644
--- a/UI/UIEventSource.ts
+++ b/UI/UIEventSource.ts
@@ -1,6 +1,6 @@
 export class UIEventSource<T>{
     
-    public data : T;
+    public data: T;
     private _callbacks = [];
 
     constructor(data: T) {
diff --git a/test.ts b/test.ts
index d71a3ff539..18b43e1ef0 100644
--- a/test.ts
+++ b/test.ts
@@ -22,4 +22,5 @@ const buttons = new RadioButton<number>(
     ], false
 ).AttachTo("maindiv");
 
+
 buttons.GetValue().addCallback(console.log);
\ No newline at end of file