Query strings are missing from active filters on facets

Problem/Motivation

If a facet display is set to Exclude ("Make the search exclude selected facets, instead of restricting it to them.") and the operator is set to "AND" then the active (selected) filter link loose the query strings and redirect to an empty search page.

http://dev.local/en/product-search?search_api_views_fulltext=querystring
vs.
http://dev.local/en/product-search

Proposed resolution

I chased down the cause to this section:
search_api/contrib/search_api_facetapi/plugins/facetapi/query_type_term.inc: line ~183

// Always include the active facet items.
foreach ($this->adapter->getActiveItems($this->facet) as $filter)  {
      $build[$filter['value']]['#count'] = 0;
}

If the count is set to zero then in the widget_links.inc the #query part is skipped.

facetapi/plugins/facetapi/widget_links.inc: line ~119

      // Adds the facetapi-zero-results class to items that have no results.
      if (!$item['#count']) {
        $variables['options']['attributes']['class'][] = 'facetapi-zero-results';
      }
      // If count more than 0.
      else {
        
.......

        // Add an ID to identify this link.
        $variables['options']['attributes']['id'] = drupal_html_id('facetapi-link');
        $variables['options'] += array(
          'html' => $item['#html'],
          'query' => $item['#query'],
        );
      }

I don't understand the whole code, so i don't know what is the right solution for this. For my case i changed like below. Now my active facets links has the query string to.

// Always include the active facet items.
foreach ($this->adapter->getActiveItems($this->facet) as $filter)  {
-      $build[$filter['value']]['#count'] = 0;
+      $build[$filter['value']]['#count'] = 1;
}

David