Moved tags to own controller