Add add_tag_suffix and remove_tag_suffix options