Add tag command
Fix tag setup command