diff --git a/templates/variants/toodego/qommon/forms/widgets/map.html b/templates/variants/toodego/qommon/forms/widgets/map.html
index 1db5c316..1b58a025 100644
--- a/templates/variants/toodego/qommon/forms/widgets/map.html
+++ b/templates/variants/toodego/qommon/forms/widgets/map.html
@@ -3,16 +3,7 @@
 {% block widget-title %}
 {% endblock %}
 
-{% block widget-control %}
-  <input type="hidden" name="{{widget.name}}$latlng" {% if widget.value %}value="{{widget.value}}"{% endif %}>
-  <div id="map-{{widget.name}}" class="qommon-map"
-    {% if widget.readonly %}data-readonly="true"{% endif %}
-    {% if widget.sync_map_and_address_fields %}data-address-sync="true"{% endif %}
-    {% for key, value in widget.map_attributes.items %}{{key}}="{{value}}" {% endfor %}
-    {% if widget.initial_position %}
-      data-init-lat="{{ widget.initial_position.lat }}"
-      data-init-lng="{{ widget.initial_position.lng }}"
-    {% endif %}
-    {% block widget-control-attributes %}{% endblock %}
-  ></div>
+{% block widget-content %}
+  {# must be repeated here as it's expected to exist when rendering view values #}
+  {{ block.super }}
 {% endblock %}
diff --git a/templates/variants/villeurbanne-2018/qommon/forms/widgets/map.html b/templates/variants/villeurbanne-2018/qommon/forms/widgets/map.html
index 73fd44a9..a226eb36 100644
--- a/templates/variants/villeurbanne-2018/qommon/forms/widgets/map.html
+++ b/templates/variants/villeurbanne-2018/qommon/forms/widgets/map.html
@@ -15,6 +15,7 @@
       data-init-lat="{{ widget.initial_position.lat }}"
       data-init-lng="{{ widget.initial_position.lng }}"
     {% endif %}
+    data-search-url="{% url 'api-geocoding' %}"
     {% block widget-control-attributes %}{% endblock %}
   ></div>
 {% endblock %}