Feature/auto enroll by tag