diff --git a/src/Plugin/views/filter/AdministrativeArea.php b/src/Plugin/views/filter/AdministrativeArea.php
index 2670db6..863d4d1 100644
--- a/src/Plugin/views/filter/AdministrativeArea.php
+++ b/src/Plugin/views/filter/AdministrativeArea.php
@@ -182,10 +182,10 @@ class AdministrativeArea extends CountryAwareInOperatorBase {
     ];
 
     $filter_options = [];
-    // Find all country_code filters from address.module for the valid choices.
+    // Find all country* filters from address.module for the valid choices.
     foreach ($this->view->display_handler->getHandlers('filter') as $name => $filter) {
       $definition = $filter->pluginDefinition;
-      if ($definition['id'] == 'country_code' && $definition['provider'] == 'address') {
+      if ($definition['provider'] === 'address' && substr($definition['id'], 0, 7) === 'country') {
         $filter_options[$name] = $filter->adminLabel();
       }
     }