diff --git a/src/Plugin/facets/facet_source/SearchApiDisplayDeriver.php b/src/Plugin/facets/facet_source/SearchApiDisplayDeriver.php
index fc5d277..0c4cdb9 100644
--- a/src/Plugin/facets/facet_source/SearchApiDisplayDeriver.php
+++ b/src/Plugin/facets/facet_source/SearchApiDisplayDeriver.php
@@ -23,7 +23,7 @@ class SearchApiDisplayDeriver extends FacetSourceDeriverBase {
 
     $display_plugin_manager = $this->getSearchApiDisplayPluginManager();
     foreach ($display_plugin_manager->getInstances() as $display_id => $display) {
-      $machine_name = str_replace(PluginBase::DERIVATIVE_SEPARATOR, '__', $display_id);
+      $machine_name = $display->getDerivativeId();
 
       $supports_facets = $display->getIndex()
         ->getServerInstance()
@@ -36,6 +36,7 @@ class SearchApiDisplayDeriver extends FacetSourceDeriverBase {
       }
 
       $plugin_derivatives[$machine_name] = [
+        'id' => $base_plugin_id . PluginBase::DERIVATIVE_SEPARATOR . $machine_name,
         'display_id' => $display_id,
         'label' => $display->label(),
         'description' => $display->getDescription(),