Support entity filtering for filter_on