Fix: "coordinate" & "address" fields are optional