fix(aggregations): set base filter as part of query

so that doc counts for aggregations are affected by those filters.
fix(filter): fix combining of and filters