Added basic entity filtering.