Adjusted tags to fit plugin
Merge