Changed the way tags are handled