Added add and moved general to tag