Added entity filtering in evaluation.