Add narrow queries as individual subfilter to promote caching

Each narrow query will be cached individually which means more cache
reuse