Fix how to get tag
Add missing tag option