Add support for including drilldown queries when searching
Add test cases for facet drilldown