Moved tag into separate controller