diff --git a/sites/all/modules/contrib/custom_search/custom_search.module b/sites/all/modules/contrib/custom_search/custom_search.module
index 7bbc133..5a5767f 100644
--- a/sites/all/modules/contrib/custom_search/custom_search.module
+++ b/sites/all/modules/contrib/custom_search/custom_search.module
@@ -107,25 +107,39 @@ function custom_search_form_alter(&$form, &$form_state, $form_id) {
       if ($form['module']['#value'] == 'node' && isset($form['advanced'])) {
 
         // Criteria
-        if (!variable_get('custom_search_advanced_or_display', TRUE)) $form['advanced']['keywords']['or']['#type'] = 'hidden';
-        if (!variable_get('custom_search_advanced_phrase_display', TRUE)) $form['advanced']['keywords']['phrase']['#type'] = 'hidden';
-        if (!variable_get('custom_search_advanced_negative_display', TRUE)) $form['advanced']['keywords']['negative']['#type'] = 'hidden';
+        if (!variable_get('custom_search_advanced_or_display', TRUE)) {
+          $form['advanced']['keywords']['or']['#type'] = 'hidden';
+        }
+        if (!variable_get('custom_search_advanced_phrase_display', TRUE)) {
+          $form['advanced']['keywords']['phrase']['#type'] = 'hidden';
+        }
+        if (!variable_get('custom_search_advanced_negative_display', TRUE)) {
+          $form['advanced']['keywords']['negative']['#type'] = 'hidden';
+        }
 
         // Taxonomy
         if (module_exists('taxonomy')) {
           $vocabularies = taxonomy_get_vocabularies();
           foreach ($vocabularies as $voc) {
-            if (!variable_get('custom_search_advanced_voc' . $voc->vid . '_display', TRUE)) unset($form['advanced']['category']['#options'][$voc->name]);
+            if (!variable_get('custom_search_advanced_voc' . $voc->vid . '_display', TRUE)) {
+              unset($form['advanced']['category']['#options'][$voc->name]);
+            }
+          }
+          if (isset($form['advanced']['category']) && !count($form['advanced']['category']['#options'])) {
+            $form['advanced']['category']['#type'] = 'hidden';
           }
-          if (isset($form['advanced']['category']) && !count($form['advanced']['category']['#options'])) $form['advanced']['category']['#type'] = 'hidden';
         }
 
         // Content types
         $names = array_keys(node_type_get_names());
         foreach ($names as $name) {
-          if (!variable_get('custom_search_advanced_type_' . $name . '_display', TRUE)) unset($form['advanced']['type']['#options'][$name]);
+          if (!variable_get('custom_search_advanced_type_' . $name . '_display', TRUE)) {
+            unset($form['advanced']['type']['#options'][$name]);
+          }
+        }
+        if (!count($form['advanced']['type']['#options'])) {
+          $form['advanced']['type']['#type'] = 'hidden';
         }
-        if (!count($form['advanced']['type']['#options'])) $form['advanced']['type']['#type'] = 'hidden';
 
         if (!variable_get('custom_search_results_search', TRUE)) {
           // If basic search is hidden, original search terms are imported into advanced search.
@@ -135,7 +149,9 @@ function custom_search_form_alter(&$form, &$form_state, $form_id) {
             if (drupal_substr($value, 0, 5) != 'type:' && drupal_substr($value, 0, 5) != 'term:') $keys[] = $value;
           }
           $form['advanced']['keywords']['or']['#default_value'] = implode(' ', $keys);
-          if (!isset($GLOBALS['custom_search_nb_results']) || (isset($GLOBALS['custom_search_nb_results']) && !$GLOBALS['custom_search_nb_results'])) $form['advanced']['#collapsed'] = FALSE;
+          if (!isset($GLOBALS['custom_search_nb_results']) || (isset($GLOBALS['custom_search_nb_results']) && !$GLOBALS['custom_search_nb_results'])) {
+            $form['advanced']['#collapsed'] = FALSE;
+          }
           $form['basic']['#prefix'] = '<div class="element-invisible">';
           $form['basic']['#suffix'] = '</div>';
         }
@@ -143,8 +159,9 @@ function custom_search_form_alter(&$form, &$form_state, $form_id) {
         $form['advanced']['#collapsible'] = variable_get('custom_search_results_advanced_search_collapsible', TRUE);
         $form['advanced']['#collapsed'] = variable_get('custom_search_results_advanced_search_collapsed', TRUE);
 
-        if (!variable_get('custom_search_results_advanced_search', TRUE)) unset($form['advanced']);
-
+        if (!variable_get('custom_search_results_advanced_search', TRUE)) {
+          $form['advanced']['#type'] = 'hidden';
+        }
       }
 
     break;