Minor change on TagManager