diff --git template.php template.php
index 0fbd14a..1e73daf 100644
--- template.php
+++ template.php
@@ -597,6 +597,7 @@ function _rubik_icon_classes($path) {
  */
 function _rubik_filter_form_alter(&$form) {
   $found = FALSE;
+  $fields = $form['#fields'];
   foreach (element_children($form) as $id) {
     // Filter form element found
     if (
@@ -604,6 +605,16 @@ function _rubik_filter_form_alter(&$form) {
       is_array($form[$id]['#element_validate']) &&
       in_array('filter_form_validate', $form[$id]['#element_validate'])
     ) {
+      // Unlimited value CCK fields should not be altered
+      // to avoid breaking the AHAH drag n drop and 'Add more'
+      // functionality.
+      if (isset($form['#field_name'])) {
+        $field_name = $form['#field_name'];
+        $field = content_fields($field_name);
+        if ($field['multiple'] == 1) {
+          continue;
+        }
+      }
       $form[$id]['#type'] = 'markup';
       $form[$id]['#theme'] = 'filter_form';
       $found = TRUE;