cleaned up some of the click to add tags things