anchor.diff:                               end
                        end).
   
  -
  +-spec gather_solr_queries([pid()], #chef_solr_query{}, binary()) ->
  +                                 {ok, non_neg_integer(), non_neg_integer(), {[binary()], {[binary()], #chef_solr_query{}, binary()}}}.
   gather_solr_queries(Pids, Query, OrgName) ->
  -    log_differences([ receive
  -          {Pid, Result} ->
  -              Result
  -      after envy:get(chef_wm, solr_timeout, 30000, pos_integer) ->
  -              erlang:error({solr_query_timeout, Pid})
  -      end
  -      || Pid <- Pids ], Query, OrgName).
  -
  -log_differences([{error, _} = Solr1, {_,_,_,Solr4}] = Results, Query, OrgName) ->
  +    [Solr1,Solr4] = [ receive
  +                          {Pid, Result} ->
  +                              Result
  +                      after envy:get(chef_wm, solr_timeout, 30000, pos_integer) ->
  +                              erlang:error({solr_query_timeout, Pid})
  +                      end
  +                      || Pid <- Pids ],
  +    log_error_differences(Solr1, Solr4, Query, OrgName),
  +    combine_results(Solr1, Solr4, Query, OrgName).
  +
  +combine_results({error, _} = Solr1, _, _, _) ->
  +    Solr1;
  +combine_results(Solr1, {error, _}, _, _) ->
  +    Solr1;
  +combine_results({Resp,Start,Count,Solr1Results}, {_,_,_,Solr4Results}, Query, OrgName) ->
  +    {Resp, Start, Count, {Solr1Results, {Solr4Results, Query, OrgName}}}.
  +
  +log_error_differences({error, _} = Solr1, {_,_,_,Solr4}, Query, OrgName) ->
       lager:log(debug, [{solr_diff, ?MODULE}], "~p",
  -              [?LOG_DIFF_TUPLE(Solr1, Solr4, Query, OrgName)]),
  -    Results;
  -log_differences([{_,_,_,Solr1}, {error, _} = Solr4] = Results, Query, OrgName) ->
  +              [?LOG_DIFF_TUPLE(Solr1, Solr4, Query, OrgName)]);
  +log_error_differences({_,_,_,Solr1}, {error, _} = Solr4, Query, OrgName) ->
       lager:log(debug, [{solr_diff, ?MODULE}], "~p",
  -              [?LOG_DIFF_TUPLE(Solr1, Solr4, Query, OrgName)]),
  -    Results;
  -log_differences([{error, _}, {error, _}] = Results, _Query, _OrgName) ->
  -    Results;
  -log_differences([{_,_,_,OldSolrResults}, {_,_,_,NewSolrResults}] = Results, Query, OrgName) ->
  -    case chef_wm_util:lists_diff(OldSolrResults, NewSolrResults) of
  -        {[], []} ->
  +              [?LOG_DIFF_TUPLE(Solr1, Solr4, Query, OrgName)]);
  +log_error_differences(_NotAnErrorCondition, _Solr4, _Query, _OrgName) ->
  +    ok.
  +
  +log_differences(DbHitCount, OldSolrResults,{NewSolrResults, Query, OrgName}) ->
  +    case DbHitCount =:= length(NewSolrResults) of
  +        true ->
               ok;
  -        {Solr1, Solr4} ->
  -            lager:log(debug, [{solr_diff, ?MODULE}], "~p",
  -                                    [?LOG_DIFF_TUPLE(Solr1, Solr4, Query, OrgName)])
  -    end,
  -    Results.
  +        false ->
  +            case chef_wm_util:lists_diff(OldSolrResults, NewSolrResults) of
  +                {[], []} ->
  +                    ok;
  +                {Solr1, Solr4} ->
  +                    lager:log(debug, [{solr_diff, ?MODULE}], "~p",
  +                              [?LOG_DIFF_TUPLE(Solr1, Solr4, Query, OrgName)])
  +            end
  +    end.
   
   spawn_solr_query(Label, Url, Query, ReqId) ->
       Parent = self(),
  
positive.code:                     %% default URL goes first and that's the only result we capture
                      Pids = [ spawn_solr_query(Label, Url, Query, ReqId) ||
                                 {Label, Url} <- [{search, DefaultUrl}, {search_aux, AuxUrl}] ],
                      hd(gather_solr_queries(Pids, Query, OrgName));
                  false ->
                      execute_solr_query(ReqId, default, Query, SolrUrls)
              end
  
negative.code:             {DbNumFound, Ans} = make_search_results(BulkGetFun, Ids, BatchSize,
                                                      Start, SolrNumFound),
              State1 = State#base_state{log_msg = search_log_msg(SolrNumFound,
                                                                 solr_ids_length(Ids), DbNumFound)},
              case IndexType of
                  {data_bag, BagName} when DbNumFound =:= 0 ->
                      case chef_db:data_bag_exists(DbContext, OrgId, BagName) of
  