TJ/HM: Cache every filter for andQueryies; Join normal query with drilldown query before caching