add underscored taggings for all types (with omitempty)