Fix add_tag now assumes lock