Incorrect active facet count returned

Created a new facetapi widget, and was having difficulty understanding why I was getting an odd facet count under certain circumstances, assumed it was my new facetapi widget but the issue seems to be with (query_type_term.inc) under /search_api/contrib/search_api_facetapi/plugins/facetapi/.

Example (Minimum facet count set to 1) :

Cars with the facets (Makes / Models)

Makes (Facet set to OR):
--Vauxhall (10)
--Audi (10)

Models (Facet set to OR)
--A3 (10)
--Insignia (10)

Steps:

1. User selects from Makes - Vauxhall and Audi.
2. 20 results are returned, and the Models facet displays all filters available (A3 and Insignia)
3. User selects Insignia
4. 10 Results are returned, awesome, but here's where the issue comes in, the `Makes` facet count is now incorrect as both Vauxhall and Audi have a facet count of 10. Where the actual result should be Vauxhall(10), Audi(0), from what I can understand this is owed to the following:

(From /search_api/contrib/search_api_facetapi/plugins/facetapi/query_type_term.inc)

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

// Then, add the facets returned by the server.
    if (isset($results['search_api_facets']) && isset($results['search_api_facets'][$this->facet['name']])) {
      $values = $results['search_api_facets'][$this->facet['name']];
      foreach ($values as $value) {
        $filter = $value['filter'];
        // As Facet API isn't really suited for our native facet filter
        // representations, convert the format here. (The missing facet can
        // stay the same.)
        if ($filter[0] == '"') {
          $filter = substr($filter, 1, -1);
        }
        elseif ($filter != '!') {
          // This is a range filter.
          $filter = substr($filter, 1, -1);
          $pos = strpos($filter, ' ');
          if ($pos !== FALSE) {
            $filter = '[' . substr($filter, 0, $pos) . ' TO ' . substr($filter, $pos + 1) . ']';
          }
        }
        $build[$filter] = array(
          '#count' => $value['count'],
        );
      }
    }
?>

As the server (Solr) only returns a facet count for Vauxhall(10), we incorrectly end up with a facet count of Audi(10) as well.

But if we alter the initial setting of active facet items, not setting it to the results count, but instead initiating it with 0, and only overwriting the #count with the data returned from Solr we get the correct result:

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

Hope the above makes sense. Please ask if I've not clarified anything, my model is actually a little more complex, but have tried to simplify for this example. Does anyone think the above change I'm making is incorrect? Should a facet count ever be set by the result count as opposed to the facet count returned by the server (solr or not)?