added entity filtering