Fixed bug with non-general tags