     @hashmap[hash] = hashValue
     return
 
-  _generateHash: (condensedQuery) ->
-    # Get Filter and Split
-    split = condensedQuery[1].split
-    filter = condensedQuery[0].filter
-    return @_filterToHash(filter) + '&' + @_splitToHash(split)
-
   _timeCalculate: (condensedQuery) ->
     split = condensedQuery[1].split
-    {timeFilter} = @_separateTimeFilter(condensedQuery[0].filter)
+    {timeFilter} = separateTimeFilter(condensedQuery[0].filter)
     timestamps = []
     timestamp = new Date(timeFilter.range[0])
     end = new Date(timeFilter.range[1])

    #   }
    # ]
    filter = condensedQuery[0].filter
    splitOp = condensedQuery[1].split
    splitOpName = splitOp.name
    ret = {}
    for value in values
      newFilter = @_addToFilter(condensedQuery, value)
      ret[value] = @hashmap[@_filterToHash(newFilter)]
      if ret[value]?
        ret[value][splitOpName] = value


    splitOp = condensedQuery[1].split

    if splitOp.bucket in ['timePeriod', 'timeDuration']
      { filter: oldFilter } = separateTimeFilter(oldFilter)
      newFilterPiece = {
        attribute: splitOp.attribute
        type: 'within'
