diff --git a/static/js/find-code.js b/static/js/find-code.js
index f640696..62a005c 100644
--- a/static/js/find-code.js
+++ b/static/js/find-code.js
@@ -15,10 +15,7 @@ async function fetchEntry(){  // This can be condensed
         tiploc: tiploc.value,
         stanox: stanox.value
     }
-
-    console.log(`Read values: ${JSON.stringify(values)}`)
-    
-    parseData(values)
+      parseData(values)
 }
 
 async function parseData(values){
@@ -35,11 +32,13 @@ async function parseData(values){
         setLoadingDesc(`Searching\n${values.stanox.toUpperCase()}`)
         var data = await getData("stanox", values.stanox)
     } else if (values.name != ""){
-        setLoadingDesc(`Searching\n${values.name.capitalize()}`)
+        setLoadingDesc(`Searching\n${values.name}`)
         var data = await getData("name", values.name)
     } else {
-        errorNoData()
-        hideLoading()
+        log("No Data", "INFO")
+        await clearForm();
+        document.getElementById("name").value = "No data entered"
+        hideLoading();
         return;
     }
 
@@ -54,14 +53,17 @@ async function getData(type, value){
         console.log(`Response: ${resp.json}`)
         return await resp.json()
     } catch (err) {
-        errorFetch(err)
+        log(`find-code.getData: Error getting data: ${err}`, "WARN")
+        return "";
     }
 }
 
 async function displayData(data){
     hideLoading();
     if (data.status === "failed" || data == ""){
-        errorNotFound()
+        log(`Unable to find data`, "WARN")
+        clearForm();
+        document.getElementById("name").value = "Not Found";
     }
     document.getElementById("name").value = data['0']['NLCDESC']
     document.getElementById("3alpha").value = data['0']['3ALPHA']
@@ -78,27 +80,4 @@ async function clearForm(){
     document.getElementById("tiploc").value = ""
     document.getElementById("stanox").value = ""
     hideLoading();
-}
-
-async function showLoading(){
-    document.getElementById("loading").style = "display: block;";
-}
-
-async function hideLoading(){
-    document.getElementById("loading").style = "display: none;";
-}
-
-async function errorNoData(){
-    console.log("No data entered")
-    window.alert("You haven't entered any data")
-}
-
-async function errorFetch(err){
-    console.log("Error fetching data")
-    console.log(err)
-}
-
-async function errorNotFound(){
-    console.log("Location not found")
-    window.alert("No location was found.  Check and try again.")
 }
\ No newline at end of file
diff --git a/static/js/index.js b/static/js/index.js
index e8dbd9a..a31da24 100644
--- a/static/js/index.js
+++ b/static/js/index.js
@@ -3,7 +3,7 @@ pageInit();
 
 async function pageInit() {
   await loadQuickLinks();
-  hideLoading();
+  hideLoading(); // From lib.main
 }
 
 async function gotoBoard(station){