anchor.diff:      error({upper_bound_specified_more_than_once, ?E_TSMSG_DUPLICATE_UPPER_BOUND}).
   
   %%
  -break_out_timeseries(Filters1, PartitionFields1, [QuantumFields]) ->
  -    case find_timestamp_bounds(QuantumFields, Filters1) of
  +break_out_timeseries(Filters1, PartitionFields1, no_quanta) ->
  +    {Body, Filters2} = split_key_from_filters(PartitionFields1, Filters1),
  +    {Body, Body, Filters2};
  +break_out_timeseries(Filters1, PartitionFields1, QuantumField) when is_binary(QuantumField) ->
  +    case find_timestamp_bounds(QuantumField, Filters1) of
           {_, {undefined, undefined}} ->
               error({incomplete_where_clause, ?E_TSMSG_NO_BOUNDS_SPECIFIED});
           {_, {_, undefined}} ->
  
positive.code:             {Position, Type}
      end.
  
  expand_where(Where, #key_v1{ast = PAST}, MaxSubQueries) ->
      GetMaxMinFun = fun({startkey, List}, {_S, E}) ->
                             {element(3, lists:last(List)), E};
                        ({endkey,   List}, {S, _E}) ->
  
negative.code:         #key_v1{ast = PartitionKeyAST} = PK,
          PartitionFields = [X || #param_v1{name = X} <- PartitionKeyAST],
      	LK = LK0#key_v1{ast = lists:sublist(LK0#key_v1.ast, length(PartitionKeyAST))},
          QuantumFieldName = quantum_field_name(DDL),
          StrippedW = strip(W, []),
          {StartW, EndW, Filter} = 
              break_out_timeseries(StrippedW, PartitionFields, QuantumFieldName),
          Mod = riak_ql_ddl:make_module_name(T),
          StartKey = rewrite(LK, StartW, Mod),
          EndKey = rewrite(LK, EndW, Mod),
  