diff --git a/drupal/sites/all/features/boinc_standard/boinc_standard.features.ckeditor_profile.inc b/drupal/sites/all/features/boinc_standard/boinc_standard.features.ckeditor_profile.inc
index 6352a4da2a..2bc6d92a0a 100644
--- a/drupal/sites/all/features/boinc_standard/boinc_standard.features.ckeditor_profile.inc
+++ b/drupal/sites/all/features/boinc_standard/boinc_standard.features.ckeditor_profile.inc
@@ -168,13 +168,13 @@ admin/settings/site-maintenance.*
         'allow_user_conf' => 'f',
         'filters' => array(
           'boinctranslate/0' => 0,
-          'htmlpurifier/0' => 0,
+          'htmlpurifier/0' => 1,
           'htmlpurifier/1' => 0,
           'filter/3' => 0,
-          'filter/0' => 1,
-          'image_caption_filter/0' => 0,
+          'filter/0' => 0,
+          'image_caption_filter/0' => 1,
           'input_formats/0' => 0,
-          'pathologic/0' => 0,
+          'pathologic/0' => 1,
         ),
         'ss' => '2',
         'min_rows' => '1',
@@ -259,7 +259,6 @@ admin/settings/site-maintenance.*
         'verified contributor' => 'verified contributor',
         'community member' => 'community member',
         'moderator' => 'moderator',
-        '' => NULL,
       ),
     ),
   );
diff --git a/drupal/sites/all/features/boinc_standard/boinc_standard.input_formats.inc b/drupal/sites/all/features/boinc_standard/boinc_standard.input_formats.inc
index 3702da46c6..a5f8f10bc8 100644
--- a/drupal/sites/all/features/boinc_standard/boinc_standard.input_formats.inc
+++ b/drupal/sites/all/features/boinc_standard/boinc_standard.input_formats.inc
@@ -26,81 +26,11 @@ function boinc_standard_input_formats() {
       // Print debugging info
       'boinctranslate_filter_debug' => '0',
     ),
-    // Settings for: tableofcontents module
-    'tableofcontents' => array(
-      // Hide the table of contents tags
-      'tableofcontents_hide_table' => 0,
-      // Whether an automatic table of content should be added
-      'tableofcontents_automatic' => '0',
-      // Number of headers before an automatic table of content is added
-      'tableofcontents_min_limit' => '5',
-      // Remove Table of Contents tags from teasers
-      'tableofcontents_remove_teaser' => 1,
-      // Allow users to override the settings within the table of contents tag itself
-      'tableofcontents_allow_override' => 1,
-      // Ensure title is safe (i.e. use check_plain() to avoid XSS attacks.)
-      'tableofcontents_safe_title' => 1,
-      // Table of Contents Title
-      'tableofcontents_title' => 'Table of Contents',
-      // Minimum heading level
-      'tableofcontents_minlevel' => '2',
-      // Maximum heading level
-      'tableofcontents_maxlevel' => '3',
-      // Include link to hide/show table of contents
-      'tableofcontents_hide_show' => 1,
-      // Start with the table of content collapsed
-      'tableofcontents_collapsed' => 0,
-      // Select what is stripped from the header titles
-      'tableofcontents_id_stripping' => array(
-          'digits' => 0,
-          'dashes' => 0,
-          'periods' => 0,
-          'underscores' => 0,
-          'colons' => 0,
-        ),
-      // Identifier introducer
-      'tableofcontents_identifier_introducer' => 'header',
-      // Identifier and number separator
-      'tableofcontents_id_separator' => '-',
-      // How to generate missing header identifiers
-      'tableofcontents_id_generator' => 'title',
-      // List of tags allowed in table headers
-      'tableofcontents_allowed_tags' => '<em> <i> <strong> <b> <u> <del> <ins> <sub> <sup> <cite> <strike> <s> <tt> <span> <font> <abbr> <acronym> <dfn> <q> <bdo> <big> <small>',
-      // Attachments
-      'tableofcontents_attachments' => 0,
-      // Add the comments to the table of contents
-      'tableofcontents_comments' => 0,
-      // Select header level at which comments start
-      'tableofcontents_comments_level' => '3',
-      // Back to top label
-      'tableofcontents_back_to_top' => '',
-      // Back to top location
-      'tableofcontents_back_to_top_location' => 'bottom',
-      // Minimum level where Back to Top appears
-      'tableofcontents_back_to_top_minlevel' => '2',
-      // Maximum level where Back to Top appears
-      'tableofcontents_back_to_top_maxlevel' => '4',
-      // Back to top anchor
-      'tableofcontents_back_to_top_anchor' => 'toc',
-      // Scroll back to the table of contents
-      'tableofcontents_scroll_back_to_top' => 0,
-      // Numbering method
-      'tableofcontents_numbering' => '0',
-      // Add the number to the headers
-      'tableofcontents_number_headers' => 0,
-      // Numbering mode
-      'tableofcontents_number_mode' => '0',
-      // Numbering prefix
-      'tableofcontents_number_start_letter' => '',
-      // Numbering separator
-      'tableofcontents_number_separator' => '.',
-      // Numbering suffix
-      'tableofcontents_number_end_letter' => '.',
-    ),
     // Settings for: pathologic module
     'pathologic' => array(
       // Also considered local
-      'filter_pathologic_local_paths' => '/',
+      'filter_pathologic_local_paths' => '/
+',
       // Output full absolute URLs
       'filter_pathologic_absolute' => 1,
     ),
@@ -145,31 +75,102 @@ function boinc_standard_input_formats() {
           ),
         ),
     ),
+    // Settings for: tableofcontents module
+    'tableofcontents' => array(
+      // Hide the table of contents tags
+      'tableofcontents_hide_table' => 0,
+      // Whether an automatic table of content should be added
+      'tableofcontents_automatic' => '0',
+      // Number of headers before an automatic table of content is added
+      'tableofcontents_min_limit' => '5',
+      // Remove Table of Contents tags from teasers
+      'tableofcontents_remove_teaser' => 1,
+      // Allow users to override the settings within the table of contents tag itself
+      'tableofcontents_allow_override' => 1,
+      // Ensure title is safe (i.e. use check_plain() to avoid XSS attacks.)
+      'tableofcontents_safe_title' => 1,
+      // Table of Contents Title
+      'tableofcontents_title' => 'Table of Contents',
+      // Minimum heading level
+      'tableofcontents_minlevel' => '2',
+      // Maximum heading level
+      'tableofcontents_maxlevel' => '3',
+      // Include link to hide/show table of contents
+      'tableofcontents_hide_show' => 1,
+      // Start with the table of content collapsed
+      'tableofcontents_collapsed' => 0,
+      // Select what is stripped from the header titles
+      'tableofcontents_id_stripping' => array(
+          'digits' => 0,
+          'dashes' => 0,
+          'periods' => 0,
+          'underscores' => 0,
+          'colons' => 0,
+        ),
+      // Identifier introducer
+      'tableofcontents_identifier_introducer' => 'header',
+      // Identifier and number separator
+      'tableofcontents_id_separator' => '-',
+      // How to generate missing header identifiers
+      'tableofcontents_id_generator' => 'title',
+      // List of tags allowed in table headers
+      'tableofcontents_allowed_tags' => '<em> <i> <strong> <b> <u> <del> <ins> <sub> <sup> <cite> <strike> <s> <tt> <span> <font> <abbr> <acronym> <dfn> <q> <bdo> <big> <small>',
+      // Show attachments in the table of contents
+      'tableofcontents_attachments' => 0,
+      // Add the comments to the table of contents
+      'tableofcontents_comments' => 0,
+      // Select header level at which comments start
+      'tableofcontents_comments_level' => '3',
+      // Back to top label
+      'tableofcontents_back_to_top' => '',
+      // Back to top location
+      'tableofcontents_back_to_top_location' => 'bottom',
+      // Minimum level where Back to Top appears
+      'tableofcontents_back_to_top_minlevel' => '2',
+      // Maximum level where Back to Top appears
+      'tableofcontents_back_to_top_maxlevel' => '4',
+      // Back to top anchor
+      'tableofcontents_back_to_top_anchor' => 'toc',
+      // Scroll back to the table of contents
+      'tableofcontents_scroll_back_to_top' => 0,
+      // Numbering method
+      'tableofcontents_numbering' => '0',
+      // Add the number to the headers
+      'tableofcontents_number_headers' => 0,
+      // Numbering mode
+      'tableofcontents_number_mode' => '0',
+      // Numbering prefix
+      'tableofcontents_number_start_letter' => '',
+      // Numbering separator
+      'tableofcontents_number_separator' => '.',
+      // Numbering suffix
+      'tableofcontents_number_end_letter' => '.',
+    ),
   );
   $input_format->filters = array(
     'boinctranslate' => array(
       // Delta => Weight for: BOINC translation filter to help split content into chunks for translations.
-      '0' => '1',
-    ),
-    'tableofcontents' => array(
-      // Delta => Weight for: Table of contents
-      '0' => '2',
+      '0' => '-10',
     ),
     'pathologic' => array(
       // Delta => Weight for: Pathologic
-      '0' => '3',
+      '0' => '-9',
     ),
     'bbcode' => array(
       // Delta => Weight for: BBCode
-      '0' => '4',
+      '0' => '-8',
     ),
     'htmlpurifier' => array(
       // Delta => Weight for: HTML Purifier
-      '0' => '5',
+      '0' => '-7',
+    ),
+    'tableofcontents' => array(
+      // Delta => Weight for: Table of contents
+      '0' => '-6',
     ),
     'image_caption_filter' => array(
       // Delta => Weight for: Image caption filter
-      '0' => '6',
+      '0' => '-5',
     ),
   );
   $input_format->machine = 'rich_text';
@@ -186,11 +187,9 @@ function boinc_standard_input_formats() {
   );
   $input_format->filters = array(
     'boinctranslate' => array(
-      // Delta => Weight for: BOINC translation filter to help split content into chunks for translations.
       '0' => '10',
     ),
     'filter' => array(
-      // Delta => Weight for: HTML filter
       '0' => '10',
     ),
   );