503,504c503,504
< +      $facets_block_id = str_replace('_', '', $block_id);
< +      $block_entity = $this->storage->load($facets_block_id);
---
> +      // $facets_block_id = str_replace('_', '', $facets_block);
> +      $block_entity = $this->storage->load($block_id);
613c613
< +      if (!empty($build['#use_ajax']) && isset($facet_id)) {
---
> +      if (!empty($build['#use_ajax']) && isset($this->configuration['block_id'])) {
615c615
< +        $build['#attributes']['class'][] = 'js-facet-block-id-' . $facet_id;
---
> +        $build['#attributes']['class'][] = 'js-facet-block-id-' . $this->configuration['block_id'];