Fix some tag add bugs