diff --git a/islandora_advanced_search.module b/islandora_advanced_search.module
index bc8a4db..ed751f0 100644
--- a/islandora_advanced_search.module
+++ b/islandora_advanced_search.module
@@ -88,15 +88,17 @@ function islandora_advanced_search_form_block_form_alter(&$form, FormStateInterf
   $condition_id = 'node_has_term';
 
   /** @var \Drupal\Core\Condition\ConditionInterface $condition */
-  /*$condition = $manager->createInstance($condition_id, isset($visibility[$condition_id]) ? $visibility[$condition_id] : []);
-  $form_state->set(['conditions', $condition_id], $condition);
-  $condition_form = $condition->buildConfigurationForm([], $form_state);
-  $condition_form['#type'] = 'details';
-  $condition_form['#title'] = $condition->getPluginDefinition()['label'];
-  $condition_form['#group'] = 'visibility_tabs';
-  // Not all blocks are required to give this field.
-  $condition_form['term']['#required'] = FALSE;
-  $form['visibility'][$condition_id] = $condition_form;*/
+  if (array_key_exists($condition_id,$visibility)) {
+    $condition = $manager->createInstance($condition_id, isset($visibility[$condition_id]) ? $visibility[$condition_id] : []);
+    $form_state->set(['conditions', $condition_id], $condition);
+    $condition_form = $condition->buildConfigurationForm([], $form_state);
+    $condition_form['#type'] = 'details';
+    $condition_form['#title'] = $condition->getPluginDefinition()['label'];
+    $condition_form['#group'] = 'visibility_tabs';
+    // Not all blocks are required to give this field.
+    $condition_form['term']['#required'] = FALSE;
+    $form['visibility'][$condition_id] = $condition_form;
+  }
 }
 
 /**