Fix TagCommand
Add a shortcut to TagCommand