diff --git a/imports/ui/components/SelectionMap/SelectionMap.js b/imports/ui/components/SelectionMap/SelectionMap.js
index 941dc53..1651a5b 100644
--- a/imports/ui/components/SelectionMap/SelectionMap.js
+++ b/imports/ui/components/SelectionMap/SelectionMap.js
@@ -58,10 +58,13 @@ class SelectionMap extends Component {
 
   updatePosition() {
     const { lat, lng } = this.marker.leafletElement.getLatLng();
+    const currentDistance = this.state.distance;
     this.setState({
       marker: [lat, lng],
       modified: true
     });
+    console.log(currentDistance);
+    this.props.onSelection({ lat, lng, currentDistance });
     this.fit();
   }
 
@@ -73,11 +76,12 @@ class SelectionMap extends Component {
   addScale() {
     // https://www.npmjs.com/package/leaflet-graphicscale
     const map = this.getMap();
-    var options = {
+    const options = {
       fill: 'fill',
       showSubunits: true
     };
-    var graphicScale = L.control.graphicScale([options]).addTo(map);
+    // var graphicScale =
+    Leaflet.control.graphicScale([options]).addTo(map);
   }
 
   doSubs() { // event param not used
@@ -88,11 +92,9 @@ class SelectionMap extends Component {
   }
 
   render() {
-    this.state.center = !this.state.modified && this.props.lat?
-                        [this.props.lat, this.props.lng]: this.state.center;
-    this.state.marker = !this.state.modified && this.props.lat?
-                        [this.props.lat, this.props.lng]: this.state.marker;
-    this.state.distance = this.props.distance;
+    this.state.center = !this.state.modified && this.props.lat? [this.props.lat, this.props.lng]: this.state.center;
+    this.state.marker = !this.state.modified && this.props.lat? [this.props.lat, this.props.lng]: this.state.marker;
+    this.state.distance = !this.state.modified? this.props.distance: this.state.distance;
     this.state.modified = false;
     return (
       <div>
@@ -142,12 +144,16 @@ class SelectionMap extends Component {
     );
   }
 }
+SelectionMap.defaultProps = {
+  distance: 10
+};
 
 SelectionMap.propTypes = {
   history: PropTypes.object.isRequired,
   lat: PropTypes.number,
   lng: PropTypes.number,
-  distance: PropTypes.number
+  distance: PropTypes.number,
+  onSelection: PropTypes.func.isRequired
 };
 
 export default translate([], { wait: true })(SelectionMap);
diff --git a/imports/ui/pages/FireSubscription/FireSubscription.js b/imports/ui/pages/FireSubscription/FireSubscription.js
index 02e47b5..4da671c 100644
--- a/imports/ui/pages/FireSubscription/FireSubscription.js
+++ b/imports/ui/pages/FireSubscription/FireSubscription.js
@@ -36,6 +36,10 @@ class FireSubscription extends React.Component {
     this.setState(update(this.state, {$merge: {distance: value}}));
   }
 
+  onSelection(value) {
+    this.setState(update(this.state, {$merge: {lat: value.lat, lng: value.lng, distance: value.distance}}));
+  }
+
   render() {
     // https://developers.google.com/places/web-service/search
     // https://github.com/kenny-hibino/react-places-autocomplete/blob/master/demo/Demo.js
@@ -65,8 +69,9 @@ class FireSubscription extends React.Component {
             <SelectionMap
                 lat={this.state.lat}
                 lng={this.state.lng}
-                distance={this.state.distance || 10}
+                distance={this.state.distance}
                 history={this.props.history}
+                onSelection={(state) => this.onSelection(state)}
             />
           </Row>
         </div>