*: fix tags so that they are safer and more sane