Move highlight logic to agent #29