diff --git a/conditional_fields.module b/conditional_fields.module
index 3b4ba7f..efacfca 100644
--- a/conditional_fields.module
+++ b/conditional_fields.module
@@ -428,11 +428,11 @@ function _conditional_fields_element_add_property(&$element, $property, $value,
  */
 function conditional_fields_field_selector($field) {
   if (isset($field['#attributes']['name'])) {
-    return '[name="' . $field['#attributes']['name'] . '"]';
+    return ':input[name="' . $field['#attributes']['name'] . '"]';
   }
 
   if (isset($field['#name'])) {
-    return '[name="' . $field['#name'] . '"]';
+    return ':input[name="' . $field['#name'] . '"]';
   }
 
   // Try with id if name is not found.
diff --git a/js/conditional_fields.js b/js/conditional_fields.js
index 7dd474a..3706acd 100644
--- a/js/conditional_fields.js
+++ b/js/conditional_fields.js
@@ -75,6 +75,7 @@ $(document).bind('state:visible-fade', function(e) {
   }
 })
 // Empty/Filled.
+.bind('state:empty', function() {})
 .bind('state:empty-empty', function(e) {
   if (e.trigger) {
     var field = $(e.target).find('input, select, textarea');
@@ -123,7 +124,7 @@ Drupal.behaviors.conditionalFields = {
           if (typeof effect !== 'undefined') {
             var effectEvent = i + '-' + effect.effect;
             if (typeof eventsData[effectEvent] !== 'undefined') {
-              $(e.target).trigger({ type : effectEvent, trigger : e.trigger, value : e.value, effect : effect.options });
+              $(e.target).trigger({ type : effectEvent, trigger : e.trigger, value : e.value, effect : effect.options[effect.effect] });
               return;
             }
           }