diff --git a/includes/class-hvac-organizers.php b/includes/class-hvac-organizers.php
index 03e7c663..3829ea47 100644
--- a/includes/class-hvac-organizers.php
+++ b/includes/class-hvac-organizers.php
@@ -116,10 +116,14 @@ class HVAC_Organizers {
             'offset' => $offset,
             'orderby' => 'title',
             'order' => 'ASC',
-            'post_status' => 'publish',
-            'author' => $current_user_id // Only show organizers created by this user
+            'post_status' => 'publish'
         );
         
+        // Master trainers can see all organizers, regular trainers only see their own
+        if (!current_user_can('hvac_master_trainer') && !current_user_can('manage_options')) {
+            $query_args['author'] = $current_user_id;
+        }
+        
         // Filter handling
         if (!empty($_GET['search'])) {
             $query_args['s'] = sanitize_text_field($_GET['search']);
diff --git a/includes/class-hvac-venues.php b/includes/class-hvac-venues.php
index 6aa0da78..b69984db 100644
--- a/includes/class-hvac-venues.php
+++ b/includes/class-hvac-venues.php
@@ -124,7 +124,7 @@ class HVAC_Venues {
         if (!empty($_GET['state'])) {
             $query_args['meta_query'] = array(
                 array(
-                    'key' => '_VenueStateProvince',
+                    'key' => '_VenueState',
                     'value' => sanitize_text_field($_GET['state']),
                     'compare' => '='
                 )
@@ -201,7 +201,10 @@ class HVAC_Venues {
                             // Get venue meta
                             $address = get_post_meta($venue_id, '_VenueAddress', true);
                             $city = get_post_meta($venue_id, '_VenueCity', true);
-                            $state = get_post_meta($venue_id, '_VenueStateProvince', true);
+                            $state = get_post_meta($venue_id, '_VenueState', true);
+                            if (empty($state)) {
+                                $state = get_post_meta($venue_id, '_VenueStateProvince', true);
+                            }
                             $phone = get_post_meta($venue_id, '_VenuePhone', true);
                             ?>
                             <tr>