Fixed tag retrieval race condition on add.