Move some of the extra items to tags