Fix entity-only targeting