diff --git a/README.md b/README.md
index ae266060b1..53687f0bc1 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,14 @@
 # MapComplete
 
 > Let a thousand flowers bloom
+ 
+<p align=center>
+<a href="https://liberapay.com/pietervdvn/">
+  <img src="https://img.shields.io/liberapay/patrons/Pietervdvn.svg?logo=liberapay">
+  <img src="https://img.shields.io/liberapay/receives/pietervdvn.svg?logo=liberapay">
+</a>
+</p>
+
 
 **MapComplete is an OpenStreetMap viewer and editor.** It shows map features on a certain topic, and allows to see, edit
 and add new features to the map. It can be seen as a
diff --git a/UI/Popup/TagRenderingQuestion.ts b/UI/Popup/TagRenderingQuestion.ts
index ff38b2f439..abec9ec6cf 100644
--- a/UI/Popup/TagRenderingQuestion.ts
+++ b/UI/Popup/TagRenderingQuestion.ts
@@ -30,6 +30,7 @@ import Img from "../Base/Img";
 import FeaturePipelineState from "../../Logic/State/FeaturePipelineState";
 import Title from "../Base/Title";
 import {OsmConnection} from "../../Logic/Osm/OsmConnection";
+import {GeoOperations} from "../../Logic/GeoOperations";
 
 /**
  * Shows the question element.
@@ -414,9 +415,10 @@ export default class TagRenderingQuestion extends Combine {
 
         const tagsData = tags.data;
         const feature = state.allElements.ContainingFeatures.get(tagsData.id)
+        const center = GeoOperations.centerpointCoordinates(feature)
         const input: InputElement<string> = ValidatedTextField.ForType(configuration.freeform.type).ConstructInputElement({
             country: () => tagsData._country,
-            location: [tagsData._lat, tagsData._lon],
+            location: [center[1], center[0]],
             mapBackgroundLayer: state.backgroundLayer,
             unit: applicableUnit,
             args: configuration.freeform.helperArgs,