Moved two tags to global