Bug fixes
Sample: Entity Targeting