- Updates to Tags block. This isn't used anywhere...
- Fixed breaking issue with previous commit.