Moving tag making to the right place