diff --git a/app/models/event_badge_models.py b/app/models/event_badge_models.py
index 92d8fe5..398d6f9 100644
--- a/app/models/event_badge_models.py
+++ b/app/models/event_badge_models.py
@@ -86,6 +86,7 @@ class Event_Badge_Base(BaseModel):
     country: Optional[str]
 
     # full_address: Optional[str]
+    
     location: Optional[str] # Actual location name shown on badge and other "public" areas
     location_short: Optional[str] # Auto generated short version
     location_long: Optional[str] # Auto generated long version
diff --git a/app/models/event_exhibit_tracking_models.py b/app/models/event_exhibit_tracking_models.py
index f5518ef..6acf27a 100644
--- a/app/models/event_exhibit_tracking_models.py
+++ b/app/models/event_exhibit_tracking_models.py
@@ -1,4 +1,3 @@
-from __future__ import annotations
 import datetime, hashlib, logging, os, pytz, redis, secrets
 
 from typing import Dict, List, Optional, Set, Union
@@ -64,15 +63,21 @@ class Event_Exhibit_Tracking_Base(BaseModel):
 
     event_badge_designations: Optional[str]
     event_badge_professional_title: Optional[str]
+    event_badge_display_professional_title
     event_badge_affiliations: Optional[str]
+    event_badge_display_affiliations
 
     event_badge_email: Optional[str]
+
     event_badge_city: Optional[str]
-    country_subdivision_code: Optional[str]
-    state_province_abb: Optional[str]
-    state_province: Optional[str]
-    country_alpha_2_code: Optional[str]
-    country: Optional[str]
+    event_badge_country_subdivision_code: Optional[str]
+    event_badge_state_province_abb: Optional[str]
+    event_badge_state_province: Optional[str]
+    event_badge_country_alpha_2_code: Optional[str]
+    event_badge_country: Optional[str]
+
+    event_badge_location
+    event_badge_display_location
 
     event_person_informal_name: Optional[str]
     event_person_given_name: Optional[str]