- Removal needs to happen before comparisions

ui/workers/gather_encounter_locations.py

@@ -60,6 +60,12 @@ class GatherEncountersWorker(QRunnable):
             if form and name in form:
                 form = form.replace(name, "").strip()
 
+            if form and form.startswith("Female"):
+                form = form.replace("Female", "").strip()
+
+            if form and form.startswith("Male"):
+                form = form.replace("Male", "").strip()
+
             if form and form in default_forms:
                 form = None  
 
@@ -78,12 +84,6 @@ class GatherEncountersWorker(QRunnable):
             if name.lower() == "ho-oh":
                 name = "Ho-Oh"
 
-            if form and form.startswith("Female"):
-                form = form.replace("Female", "").strip()
-
-            if form and form.startswith("Male"):
-                form = form.replace("Male", "").strip()
-
             if form == "":
                 form = None