diff --git a/apps/golfview/README.md b/apps/golfview/README.md
index 56d90782d..99c977f80 100644
--- a/apps/golfview/README.md
+++ b/apps/golfview/README.md
@@ -1,8 +1,8 @@
 # App Name
 
-Describe the app...
+This app leverages open source map data to give you a birds eye view of your golf game! See a preview of any hole as well as your realtime distance to the green and position on the hole.
 
-Add screen shots (if possible) to the app folder and link then into this file with ![](<name>.png)
+![hole3](screenshot.png)
 
 ## Usage
 
@@ -10,8 +10,20 @@ Select your course of interest upon loading this app.
 
 ## Contributions
 
-The performance of this app depends on the accuracy and consistency of user-submitted maps. Please contribute to Open Street Map using these guidelines and provide input in ways to support this application.
-
+The performance of this app depends on the accuracy and consistency of user-submitted maps. 
+    <ul>
+      <li>See official mapping guidelines <a
+          href="https://wiki.openstreetmap.org/wiki/Tag:leisure%3Dgolf_course">here</a>.</li>
+      <li>All holes and features must be within the target course's area.</li>
+      <li>Supported features are greens, fairways, tees, bunkers, water hazards and holes.</li>
+      <li>All features for a given hole should have the "ref" tag with the hole number as value. Shared features should
+        list ref values separated by ';'. <a href="https://www.openstreetmap.org/way/36896320">example</a>.</li>
+      <li>There must be 18 holes and they must have the following tags: handicap, par, ref, dist</li>
+      <li>For any mapping assistance or issues, please file in the <a
+          href="https://github.com/espruino/BangleApps/issues/new?assignees=&labels=bug&template=bangle-bug-report-custom-form.yaml&title=[golfview]+Short+description+of+bug">official
+          repo</a></li>
+    </ul>
+    <a href="https://www.openstreetmap.org/way/25447898">Example Course</a>
 ## Controls
 
 Swipe to change holes and tap to see a green closeup.
diff --git a/apps/golfview/custom.html b/apps/golfview/custom.html
index ee468e0ca..d9b89f336 100644
--- a/apps/golfview/custom.html
+++ b/apps/golfview/custom.html
@@ -8,10 +8,28 @@
 </head>
 
 <body>
-  <p id="status">No course</p>
   <div>
-    <button id="upload" class="btn btn-primary" disabled="true">Upload to Device</button>
-    <button id="download" class="btn btn-primary" disabled="true">Download Course</button>
+    <input type="text" placeholder="Course ID" id="course_id">
+    <button type="button" onclick="courseSearch();">Search</button>
+    <p id="status"></p>
+    <div>
+      <button id="upload" class="btn btn-primary" disabled="true">Upload to Device</button>
+      <button id="download" class="btn btn-primary" disabled="true">Download Course</button>
+    </div>
+    <p>A course needs a few things to be parsed correctly by this tool.</p>
+    <ul>
+      <li>See official mapping guidelines <a
+          href="https://wiki.openstreetmap.org/wiki/Tag:leisure%3Dgolf_course">here</a>.</li>
+      <li>All holes and features must be within the target course's area.</li>
+      <li>Supported features are greens, fairways, tees, bunkers, water hazards and holes.</li>
+      <li>All features for a given hole should have the "ref" tag with the hole number as value. Shared features should
+        list ref values separated by ';'. <a href="https://www.openstreetmap.org/way/36896320">example</a>.</li>
+      <li>There must be 18 holes and they must have the following tags: handicap, par, ref, dist</li>
+      <li>For any mapping assistance or issues, please file in the <a
+          href="https://github.com/espruino/BangleApps/issues/new?assignees=&labels=bug&template=bangle-bug-report-custom-form.yaml&title=[golfview]+Short+description+of+bug">official
+          repo</a></li>
+    </ul>
+    <a href="https://www.openstreetmap.org/way/25447898">Example Course</a>
   </div>
 
   <script src="../../core/lib/customize.js"></script>
@@ -19,10 +37,15 @@
 
   <script>
     const url = "https://overpass-api.de/api/interpreter";
-    //let query = `[bbox:37.4829,-122.8694,39.7110,-120.6215][out:json][timeout:5];way["name"="El Macero Country Club"];map_to_area ->.golfcourse;way["golf"="hole"](area.golfcourse)->.holes;(relation["golf"="fairway"](area.golfcourse);way["golf"~"^(green|tee|water_hazard|bunker|fairway)"](area.golfcourse);)->.features;.holes out geom;.features out geom;`;
-    let query = `[bbox:37.4829,-122.8694,39.7110,-120.6215][out:json][timeout:5];way["name"="Davis Golf Course"];map_to_area ->.golfcourse;way["golf"="hole"](area.golfcourse)->.holes;(relation["golf"="fairway"](area.golfcourse);way["golf"~"^(green|tee|water_hazard|bunker|fairway)"](area.golfcourse);)->.features;.holes out geom;.features out geom;`;
+    let query = `[out:json][timeout:5];way(25447898);map_to_area ->.golfcourse;way["golf"="hole"](area.golfcourse)->.holes;(relation["golf"="fairway"](area.golfcourse);way["golf"~"^(green|tee|water_hazard|bunker|fairway)"](area.golfcourse);)->.features;.holes out geom;.features out geom;`;
     let course_input = null;
 
+    function courseSearch() {
+      let inputVal = document.getElementById("course_id").value;
+      query = `[out:json][timeout:5];way(${inputVal});map_to_area ->.golfcourse;way["golf"="hole"](area.golfcourse)->.holes;(relation["golf"="fairway"](area.golfcourse);way["golf"~"^(green|tee|water_hazard|bunker|fairway)"](area.golfcourse);)->.features;.holes out geom;.features out geom;`;
+      doQuery();
+    }
+
     function processFeatures(course_verbose) {
       let course_processed = {
         holes: {}
@@ -104,19 +127,25 @@
     });
 
     // download info from the course
-    $.post(url, query, function (result) {
-      course_input = result;
-      console.log(course_input);
-      out = processFeatures(course_input.elements);
-      console.log(out);
-      courses.push({
-        name: "golfcourse-" + course_name + ".json",
-        content: JSON.stringify(out),
-      });
-      $('#status').text("Course retrieved!");
-      $('#upload').attr("disabled", false);
-      $('#download').attr("disabled", false);
-    })
+    function doQuery() {
+      $.post(url, query, function (result) {
+        if (result.elements.length === 0) {
+          $('#status').text("Course not found!");
+          return;
+        }
+        course_input = result;
+        console.log(course_input);
+        out = processFeatures(course_input.elements);
+        console.log(out);
+        courses.push({
+          name: "golfcourse-" + course_name + ".json",
+          content: JSON.stringify(out),
+        });
+        $('#status').text("Course retrieved!");
+        $('#upload').attr("disabled", false);
+        $('#download').attr("disabled", false);
+      })
+    }
 
   </script>
 </body>
diff --git a/apps/golfview/screenshot.png b/apps/golfview/screenshot.png
new file mode 100644
index 000000000..983b19ece
Binary files /dev/null and b/apps/golfview/screenshot.png differ
