Move the tag stuff inside conditional
Note to self: Don't copy-paste
Merge pull request #8 from Bakual/OrderingNotice

Move the tag stuff inside conditional