Further autoformat enhancements