Modified filter-override so it doesn't always query entities.