diff -u b/core/modules/filter/src/Plugin/migrate/source/d6/FilterFormat.php b/core/modules/filter/src/Plugin/migrate/source/d6/FilterFormat.php
--- b/core/modules/filter/src/Plugin/migrate/source/d6/FilterFormat.php
+++ b/core/modules/filter/src/Plugin/migrate/source/d6/FilterFormat.php
@@ -11,7 +11,7 @@
 use Drupal\migrate\Row;
 
 /**
- * Drupal 6 role source from database.
+ * Drupal 6 filter source from database.
  *
  * @MigrateSource(
  *   id = "d6_filter_format"
@@ -23,10 +23,7 @@
    * {@inheritdoc}
    */
   public function query() {
-    $query = $this->select('filter_formats', 'f')
-      ->fields('f', array('format', 'name', 'roles', 'cache'))
-      ->orderBy('format');
-    return $query;
+    return $this->select('filter_formats', 'f')->fields('f');
   }
 
   /**
@@ -35,9 +32,10 @@
   public function fields() {
     return array(
       'format' => $this->t('Format ID.'),
-      'name' => $this->t('The name of the filter format.'),
-      'roles' => $this->t('The user roles that can use the format.'),
-      'cache' => $this->t('Flag to indicate whether format is cacheable. (1 = cacheable, 0 = not cacheable).'),
+      'name' => $this->t('The name of the format.'),
+      'cache' => $this->t('Whether the format is cacheable.'),
+      'roles' => $this->t('The role IDs which can use the format.'),
+      'filters' => $this->t('The filters configured for the format.'),
     );
   }
 
diff -u b/core/modules/filter/src/Plugin/migrate/source/d7/FilterFormat.php b/core/modules/filter/src/Plugin/migrate/source/d7/FilterFormat.php
--- b/core/modules/filter/src/Plugin/migrate/source/d7/FilterFormat.php
+++ b/core/modules/filter/src/Plugin/migrate/source/d7/FilterFormat.php
@@ -11,7 +11,7 @@
 use Drupal\migrate\Row;
 
 /**
- * Drupal 7 role source from database.
+ * Drupal 7 filter source from database.
  *
  * @MigrateSource(
  *   id = "d7_filter_format"
@@ -32,10 +32,10 @@
   public function fields() {
     return array(
       'format' => $this->t('Format ID.'),
-      'name' => $this->t('The name of the filter format.'),
-      'cache' => $this->t('Flag to indicate whether format is cacheable (1 = cacheable, 0 = not cacheable).'),
-      'status' => $this->t('The status of the filter format'),
-      'weight' => $this->t('The weight of the filter format'),
+      'name' => $this->t('The name of the format.'),
+      'cache' => $this->t('Whether the format is cacheable.'),
+      'status' => $this->t('The status of the format'),
+      'weight' => $this->t('The weight of the format'),
       'filters' => $this->t('The filters configured for the format.'),
     );
   }