anchor.diff:          ++ couchbase_view_stats_descriptions(BucketId)
           ++ couchbase_replication_stats_descriptions(BucketId)
           ++ case AddQuery of
  -               true -> couchbase_query_stats_descriptions(BucketId);
  +               true -> couchbase_query_stats_descriptions();
                  false -> []
              end
           ++ [{struct,[{blockName,<<"Incoming XDCR Operations">>},
  
positive.code: 
      % this will throw out all samples with timestamps that are not present
      % in both BucketRawSamples and SystemRawSamples
      BSSamples = join_samples(BucketRawSamples, SystemRawSamples),
  
      QNodes = bucket_nodes("@query"),
      %% our ui sends _ with all requests. And we want to auto-add query
      %% stats only if UI is asking. We want everyone else to use some
      %% other API.
      AddQuery = case ((proplists:get_value("_", Params) =/= undefined)
                       andalso BucketName =/= "@query") of
                     true ->
                         case Nodes of
                             all ->
                                 QNodes =/= [];
                             [_|_] ->
                                 (Nodes -- QNodes) =/= Nodes
                         end;
                     false ->
                         false
                 end,
  
      Samples = case AddQuery of
                    false ->
                        BSSamples;
                    true ->
                        QueryRawSamples = grab_aggregate_op_stats("@query", QNodes, ClientTStamp, Window),
                        case Nodes of
                            [SingleNode] ->
                                case not lists:member(SingleNode, bucket_nodes(BucketName)) of
                                    true ->
                                        %% We're asking nodes that don't
                                        %% have given bucket. Thus
                                        %% BucketRawSamples must be
                                        %% empty. Thus we shouldn't even
                                        %% try to join_samples with it
                                        join_samples(QueryRawSamples, SystemRawSamples);
                                    false ->
                                        join_samples(BSSamples, QueryRawSamples)
                                end;
                            _ ->
                                join_samples(BSSamples, QueryRawSamples)
                        end
                end,
  
      StatsPropList = samples_to_proplists(Samples, BucketName),
  
  
negative.code:                 {desc,<<"Rate of streaming request wakeups on port 8091">>}]}]}].
  
  base_stats_directory("@query", _) ->
      couchbase_query_stats_descriptions();
  base_stats_directory(BucketId, AddQuery) ->
      {ok, BucketConfig} = ns_bucket:get_bucket(BucketId),
      Base = case ns_bucket:bucket_type(BucketConfig) of
  