diff --git a/app/controllers/municipalities.js b/app/controllers/municipalities.js
index 77ecf9d..f64b185 100644
--- a/app/controllers/municipalities.js
+++ b/app/controllers/municipalities.js
@@ -1,5 +1,5 @@
 const { currentRERequest } = require('../helpers/url');
-const { getMunicipalitiesForRegion } = require('../helpers/codes');
+const { getMunicipalitiesForRegion, getMunicipalityName } = require('../helpers/codes');
 
 const getMunicipality = async (req, res) => {
   let request = await currentRERequest(req);
@@ -10,9 +10,8 @@ const getMunicipality = async (req, res) => {
 
 const postMunicipality = async (req, res) => {
   const request = await currentRERequest(req);
-
   const nextStepPage = req.query.nextStep || 'naselje';
-  const nextStepUrl = `/${nextStepPage}/${request.uniqueId}/${req.body.municipalityname}`;
+  const nextStepUrl = `/${nextStepPage}/${request.uniqueId}/${getMunicipalityName(request.region, req.body.municipality)}`;
 
   request.municipality = req.body.municipality;
   await request.save();
diff --git a/app/controllers/neighborhoodMap.js b/app/controllers/neighborhoodMap.js
index 947f9d1..3874459 100644
--- a/app/controllers/neighborhoodMap.js
+++ b/app/controllers/neighborhoodMap.js
@@ -3,7 +3,6 @@ const { currentRERequest } = require('../helpers/url');
 const getNeighborhood = async (req, res) => {
     const municipality = req.params.municipality
     const nextStep = req.query.nextStep || '/';
-    console.log(municipality);
 
     res.render('neighborhoodMap', {
         nextStep,
@@ -14,10 +13,10 @@ const getNeighborhood = async (req, res) => {
 
 const postNeighborhood = async (req, res) => {
     let request = await currentRERequest(req);
-    const northWest = [req.body.north, req.body.west];
-    const northEast = [req.body.north, req.body.east];
-    const southEast = [req.body.south, req.body.east];
-    const southWest = [req.body.south, req.body.west];
+    const northWest = [req.body.west, req.body.north];
+    const northEast = [req.body.east, req.body.north];
+    const southEast = [req.body.east, req.body.south];
+    const southWest = [req.body.west, req.body.south];
 
     request.bounding_box = {
         type: 'Polygon', coordinates: [
diff --git a/app/views/municipality.ejs b/app/views/municipality.ejs
index 1c7912b..e151451 100644
--- a/app/views/municipality.ejs
+++ b/app/views/municipality.ejs
@@ -8,7 +8,7 @@
   <ul class="collection with-header">
     <% for(const municipality of municipalities) { %>
     <li class="collection-item">
-      <div val="<%= municipality.name %>" id="<%= municipality.id %>" onclick="saveAndSubmit(this.id, municipality.name)"><%= municipality.name %>
+      <div val="<%= municipality.name %>" id="<%= municipality.id %>" onclick="saveAndSubmit(this.id)"><%= municipality.name %>
         <a href="#" class="secondary-content">
           <i class="material-icons">send</i>
         </a>
@@ -17,14 +17,12 @@
     <% } %>
   </ul>
   <input type="hidden" name="municipality" id="municipality" />
-  <input type="hidden" name="municipalityname" id="municipalityname" />
 </div>
 </form>
 
 <script>
    function saveAndSubmit(id, name) {
      $("#municipality").val(id);
-     $("#municipalityname").val(name);
      $("#form-municipality").submit();
    }
 </script>