diff --git a/index.html b/index.html
index f647c4f..0559f35 100644
--- a/index.html
+++ b/index.html
@@ -33,7 +33,7 @@
     <form action="">
     
       <!-- Data is separated into course number, course prefi;x, and course name-->
-      <label for="courseField">Course Field (Ex: "MUS"):</label>
+      <label for="courseField">Course Prefix (Ex: "MUS"):</label>
       <input type="text" id="courseField" name="fname" required><br><br>
       <!-- <label for="courseNum">Course Number (Ex: "307"):</label>
         <input type="text" id="courseNum" name="fname"><br><br> -->
@@ -41,7 +41,7 @@
       <input type="text" id="courseName" name="fname" required><br><br>
       <label for="courseInstructor">Instructor (Optional)</label>
       <input type="text" id="courseInstructor" name="fname"><br><br>
-      <button type="submit" id="subBut">Submit</button><br><br>
+      <button type="button" id="subBut">Submit</button><br><br>
     
       <form>
         <label for="dropdown">Semester (work in progress):</label>
diff --git a/main.js b/main.js
index c5ea964..5036d70 100644
--- a/main.js
+++ b/main.js
@@ -8,14 +8,15 @@ function parseName() {
     // classNum = document.getElementById('courseNum').value;
     department = document.getElementById('courseField').value;
     if(department.length > 3) {
-        alert("Invalid Department");
+        alert("Invalid Prefix");
         return;
     } 
-    // if(className == '' && department == '') {
-    //     alert("At least fill out the form...");
-    //     return;
-    // }
+    if(className == '' && department == '') {
+        alert("At least fill out the form...");
+        return;
+    }
     if(className == '' || department == '') {
+        
         return;
     }
     console.log(department, 0, className);
@@ -40,7 +41,12 @@ async function PapaParse(department, num, name) {
     // .then(() => {
     //   console.log(cData);
     //  });
-    const selectedClass = cData.filter(cData => cData["Course Title"].includes(name.toUpperCase()));
+    if(cData.filter(cData => cData["Course Prefix"].includes(department.toUpperCase())).length == 0) {
+        alert("Invalid Prefix");
+        return;
+    }
+    const selectedClass = cData.filter(cData => cData["Course Prefix"].includes(department.toUpperCase()))
+                               .filter(cData => cData["Course Title"].includes(name.toUpperCase()));
     console.log(selectedClass);
     let gradeDist = { 
         "A": 0,