diff --git a/core_search_facets/src/Plugin/facets/facet_source/CoreNodeSearchFacetSource.php b/core_search_facets/src/Plugin/facets/facet_source/CoreNodeSearchFacetSource.php
index 7bdac8b..38d7b3a 100644
--- a/core_search_facets/src/Plugin/facets/facet_source/CoreNodeSearchFacetSource.php
+++ b/core_search_facets/src/Plugin/facets/facet_source/CoreNodeSearchFacetSource.php
@@ -103,7 +103,7 @@ class CoreNodeSearchFacetSource extends FacetSourcePluginBase implements CoreSea
     if ($search_page instanceof SearchPageInterface) {
       return '/' . $search_page->getPath();
     }
-    return '';
+    return '/';
   }
 
   /**
diff --git a/src/UrlProcessor/UrlProcessorPluginBase.php b/src/UrlProcessor/UrlProcessorPluginBase.php
index f42d235..92f2ab1 100644
--- a/src/UrlProcessor/UrlProcessorPluginBase.php
+++ b/src/UrlProcessor/UrlProcessorPluginBase.php
@@ -73,8 +73,8 @@ abstract class UrlProcessorPluginBase extends ProcessorPluginBase implements Url
    * {@inheritdoc}
    */
   public static function create(ContainerInterface $container, array $configuration, $plugin_id, $plugin_definition) {
-    /** @var Request $request */
-    $request = $container->get('request_stack')->getCurrentRequest();
+    /** @var \Symfony\Component\HttpFoundation\Request $request */
+    $request = $container->get('request_stack')->getMasterRequest();
     return new static($configuration, $plugin_id, $plugin_definition, $request);
   }