3 files changed, 19 insertions, 6 deletions
diff --git a/basicConfig/properties/messages.properties b/basicConfig/properties/messages.properties
index 4d9f48a0..51a5f27a 100644
--- a/basicConfig/properties/messages.properties
+++ b/basicConfig/properties/messages.properties
@@ -123,4 +123,8 @@ gui.residency.cancel=Cancel
 gui.residency.search=Search
 gui.residency.proceed=Proceed
 gui.residency.updated=Updated your input
-gui.residency.error=Error on Backend Call
-\ No newline at end of file
+gui.residency.error=Error on Backend Call
+gui.residency.input.municipality=Municipality
+gui.residency.input.village=Village
+gui.residency.input.street=Street
+gui.residency.input.number=Number
+\ No newline at end of file
diff --git a/basicConfig/properties/messages_de.properties b/basicConfig/properties/messages_de.properties
index cfbd98da..c2d1edba 100644
--- a/basicConfig/properties/messages_de.properties
+++ b/basicConfig/properties/messages_de.properties
@@ -122,4 +122,8 @@ gui.residency.cancel=Abbrechen
 gui.residency.search=Suche
 gui.residency.proceed=Weiter
 gui.residency.updated=Eingabe aktualisiert
-gui.residency.error=Fehler bei Addresssuche
-\ No newline at end of file
+gui.residency.error=Fehler bei Addresssuche
+gui.residency.input.municipality=Gemeinde
+gui.residency.input.village=Ortschaft
+gui.residency.input.street=Straße
+gui.residency.input.number=Nummer
+\ No newline at end of file
diff --git a/basicConfig/templates/residency.html b/basicConfig/templates/residency.html
index 96fa13f8..3c3c05d7 100644
--- a/basicConfig/templates/residency.html
+++ b/basicConfig/templates/residency.html
@@ -20,7 +20,8 @@
         url: "http://localhost:8080/ms_connector/residency/search",
         data: $("#inputForm").serialize()
       }).done(function (data, textStatus, jqXHR) {
-        $("#inputCity").val(data["city"]);
+        $("#inputMunicipality").val(data["municipality"]);
+        $("#inputVillage").val(data["village"]);
         $("#inputStreet").val(data["street"]);
         $("#inputNumber").val(data["number"]);
         $("#textInfo").text(updatedText);
@@ -43,11 +44,15 @@
     <div>
       <p><span id="textInfo">Infotext</span></p>
     </div>
-    <form id="inputForm" class="block" method="post" action="$contextPath$submitEndpoint"
+    <form id="inputForm" method="post" action="$contextPath$submitEndpoint"
           th:attr="action=@{${submitEndpoint}}">
       <div>
-        <label for="inputCity">City</label>
-        <input type="text" id="inputCity" name="city" value="City"/>
+        <label for="inputMunicipality">Municipality</label>
+        <input type="text" id="inputMunicipality" name="municipality" value="Municipality"/>
+      </div>
+      <div>
+        <label for="inputVillage">Village</label>
+        <input type="text" id="inputVillage" name="village" value="Village"/>
       </div>
       <div>
         <label for="inputStreet">Street</label>