diff --git a/assets/js/um-conditional.js b/assets/js/um-conditional.js
index b9f05cae..938a9091 100644
--- a/assets/js/um-conditional.js
+++ b/assets/js/um-conditional.js
@@ -62,27 +62,12 @@ function um_get_field_default_value( $dom ) {
  */
 function um_get_field_element( $dom ) {
 
+	var field_element = $dom.find( 'input,textarea,select' );
 	var type = um_get_field_type( $dom );
-	var field_element = '';
 
-	switch ( type ) {
+	field_element = wp.hooks.applyFilters( 'um_conditional_logic_field_element', field_element, type, $dom );
 
-		case 'text':
-		case 'number':
-		case 'date':
-		case 'textarea':
-		case 'select':
-		case 'multiselect':
-		case 'radio':
-		case 'checkbox':
-			field_element = $dom.find( 'input,textarea,select' );
-			break;
-		default:
-			field_element = wp.hooks.applyFilters( 'um_conditional_logic_field_element', field_element, type, $dom );
-			break;
-	}
-
-	return '';
+	return field_element;
 }
 
 /**
@@ -332,7 +317,7 @@ function um_apply_conditions( $dom, is_single_update ) {
 				default:
 
 					$owners = wp.hooks.applyFilters( 'um_conditional_logic_contains_operator_owners', $owners, field_type, live_field_value, condition, index );
-					if ( typeof $owners[ condition.owner ][ index ] == 'undefined' ) {
+					if ( typeof $owners[ condition.owner ][ index ] === 'undefined' ) {
 						if ( live_field_value && live_field_value.indexOf( condition.value ) >= 0 && um_in_array( live_field_value, $owners_values[ condition.owner ] ) ) {
 							$owners[ condition.owner ][ index ] = true;
 						} else {
diff --git a/assets/js/um-conditional.min.js b/assets/js/um-conditional.min.js
index 66e35019..b6b6949a 100644
--- a/assets/js/um-conditional.min.js
+++ b/assets/js/um-conditional.min.js
@@ -1 +1 @@
-var arr_all_conditions=[],um_field_conditions={},um_field_default_values={};function um_get_field_default_value(e){var i="",a=um_get_field_type(e);switch(a){case"text":case"number":case"date":case"textarea":case"select":i=e.find('input:text,input[type="number"],textarea,select').val();break;case"multiselect":i=e.find("select").val();break;case"radio":1<=e.find('input[type="radio"]:checked').length&&(i=e.find('input[type="radio"]:checked').val());break;case"checkbox":if(1<=e.find('input[type="checkbox"]:checked').length)if(1<e.find('input[type="checkbox"]:checked').length){var t=[];t.push(i),e.find('input[type="checkbox"]:checked').each(function(){t.push(jQuery(this).val())}),i=t}else i=e.find('input[type="checkbox"]:checked').val();break;default:i=wp.hooks.applyFilters("um_conditional_logic_default_value",i,a,e)}return{type:a,value:i}}function um_get_field_element(e){var i=um_get_field_type(e),a="";switch(i){case"text":case"number":case"date":case"textarea":case"select":case"multiselect":case"radio":case"checkbox":a=e.find("input,textarea,select");break;default:a=wp.hooks.applyFilters("um_conditional_logic_field_element",a,i,e)}return""}function um_get_field_type(e){var a="",i=e.attr("class").split(" ");return jQuery.each(i,function(e,i){/um-field-type_/.test(i)&&(a=i.replace("um-field-type_","").trim())}),a}function um_get_field_children(a){var t=[];return jQuery.each(arr_all_conditions,function(e,i){i.field.parent===a&&t.push(i.field.condition)}),t}function um_splitup_array(e,i){for(var a=e.length%i,t=a,n=Math.floor(e.length/i),u=[],r=0;r<e.length;r+=n){var o=n+r,d=!1;0!==a&&t&&(o++,t--,d=!0),u.push(e.slice(r,o)),d&&r++}var c=[];return jQuery.each(u,function(e,i){c.push({action:i[0],if_field:i[1],operator:i[2],value:i[3]})}),c}function um_get_field_data(e){return um_live_field=e.parents(".um-field").data("key"),um_live_value=e.val(),e.is(":checkbox")&&(um_live_value="",1<e.parents(".um-field").find("input:checked").length?e.parents(".um-field").find("input:checked").each(function(){um_live_value=um_live_value+jQuery(this).val()+" "}):1<=e.parents(".um-field").find("input:checked").length&&(um_live_value=e.parents(".um-field").find("input:checked").val())),e.is(":radio")&&(um_live_value=e.parents(".um-field").find("input[type=radio]:checked").val()),um_live_value}function um_in_array(e,i,a){var t,n=!1;for(t in a=!!a,i)if(a&&i[t]===e||!a&&i[t]==e){n=!0;break}return n}function um_apply_conditions(a,e){if(a.parents(".um-field[data-key]").length){var i=a.parents(".um-field[data-key]").data("key"),t=um_field_conditions[i];if(void 0!==t){var n=um_get_field_type(a.parents(".um-field[data-key]")),u=um_get_field_data(a),r={},o={},d={};jQuery.each(t,function(e,i){void 0===o[i.owner]&&(o[i.owner]=[],d[i.owner]={}),o[i.owner].push(i.value),d[i.owner]=i}),jQuery.each(t,function(e,i){if(void 0===r[i.owner]&&(r[i.owner]={}),"empty"===i.operator){var a=jQuery.isArray(u)?u.join(""):u;r[i.owner][e]=!a||""===a}if("not empty"===i.operator){a=jQuery.isArray(u)?u.join(""):u;r[i.owner][e]=!(!a||""===a)}if("equals to"===i.operator){a=jQuery.isArray(u)&&1===u.length?u[0]:u;i.value===a&&um_in_array(a,o[i.owner])?r[i.owner][e]=!0:r[i.owner][e]=!1}if("not equals"===i.operator){a=jQuery.isArray(u)&&1===u.length?u[0]:u;jQuery.isNumeric(i.value)&&parseInt(a)!==parseInt(i.value)&&a&&!um_in_array(a,o[i.owner])?r[i.owner][e]=!0:i.value==a||um_in_array(a,o[i.owner])?r[i.owner][e]=!1:r[i.owner][e]=!0}if("greater than"===i.operator){a=jQuery.isArray(u)&&1===u.length?u[0]:u;jQuery.isNumeric(i.value)&&parseInt(a)>parseInt(i.value)?r[i.owner][e]=!0:r[i.owner][e]=!1}if("less than"===i.operator){a=jQuery.isArray(u)&&1===u.length?u[0]:u;jQuery.isNumeric(i.value)&&parseInt(a)<parseInt(i.value)?r[i.owner][e]=!0:r[i.owner][e]=!1}if("contains"===i.operator)switch(n){case"multiselect":u&&0<=u.indexOf(i.value)&&um_in_array(i.value,u)?r[i.owner][e]=!0:r[i.owner][e]=!1;break;case"checkbox":u&&0<=u.indexOf(i.value)?r[i.owner][e]=!0:r[i.owner][e]=!1;break;default:void 0===(r=wp.hooks.applyFilters("um_conditional_logic_contains_operator_owners",r,n,u,i,e))[i.owner][e]&&(u&&0<=u.indexOf(i.value)&&um_in_array(u,o[i.owner])?r[i.owner][e]=!0:r[i.owner][e]=!1)}}),jQuery.each(r,function(e,i){um_in_array(!0,i)?um_field_apply_action(a,d[e],!0):um_field_apply_action(a,d[e],!1)}),a.trigger("um_fields_change")}}}function um_field_apply_action(e,i,a){var t=jQuery('div.um-field[data-key="'+i.owner+'"]');return"show"===i.action&&a&&(t.show(),_show_in_ie(t),um_field_restore_default_value(t)),"show"!==i.action||a||(t.hide(),_hide_in_ie(t)),"hide"===i.action&&a&&(t.hide(),_hide_in_ie(t)),"hide"!==i.action||a||(t.show(),_show_in_ie(t),um_field_restore_default_value(t)),e.removeClass("um-field-has-changed")}function um_field_restore_default_value(t){var e=um_get_field_type(t),i=t.data("key"),a=um_field_default_values[i];switch(e){case"text":case"number":case"date":case"textarea":t.find('input:text,input[type="number"],textareas').val(a.value);break;case"select":t.find("select").find("option").prop("selected",!1),t.find("select").val(a.value),t.find("select").trigger("change");break;case"multiselect":t.find("select").find("option").prop("selected",!1),jQuery.each(a.value,function(e,i){t.find("select").find('option[value="'+i+'"]').attr("selected",!0)}),t.find("select").trigger("change");break;case"checkbox":if(1<=t.find('input[type="checkbox"]:checked').length)if(t.find('input[type="checkbox"]:checked').removeAttr("checked"),t.find("span.um-field-checkbox-state i").removeClass("um-icon-android-checkbox-outline"),t.find("span.um-field-checkbox-state i").addClass("um-icon-android-checkbox-outline-blank"),t.find(".um-field-checkbox.active").removeClass("active"),jQuery.isArray(a.value))jQuery.each(a.value,function(e,i){var a=t.find('input[type="checkbox"][value="'+i+'"]');a.attr("checked",!0),a.closest(".um-field-checkbox").find("i").removeClass("um-icon-android-checkbox-outline-blank"),a.closest(".um-field-checkbox").find("i").addClass("um-icon-android-checkbox-outline"),a.closest(".um-field-checkbox").addClass("active")});else{var n=t.find('input[type="checkbox"][value="'+a.value+'"]');n.attr("checked",!0),n.closest(".um-field-checkbox").find("i").removeClass("um-icon-android-checkbox-outline-blank"),n.closest(".um-field-checkbox").find("i").addClass("um-icon-android-checkbox-outline"),n.closest(".um-field-checkbox").addClass("active")}break;case"radio":1<=t.find('input[type="radio"]:checked').length&&setTimeout(function(){t.find('input[type="radio"]:checked').removeAttr("checked"),t.find("span.um-field-radio-state i").removeClass("um-icon-android-radio-button-on"),t.find("span.um-field-radio-state i").addClass("um-icon-android-radio-button-off"),t.find(".um-field-radio.active").removeClass("active");var e=t.find('input[type="radio"][value="'+a.value+'"]');e.attr("checked",!0),e.closest(".um-field-radio").find("i").removeClass("um-icon-android-radio-button-off"),e.closest(".um-field-radio").find("i").addClass("um-icon-android-radio-button-on"),e.closest(".um-field-radio").addClass("active")},100);break;default:wp.hooks.doAction("um_conditional_logic_restore_default_value",e,t,a)}if(!t.hasClass("um-field-has-changed")){var u=um_get_field_element(t);"radio"!==e&&"checkbox"!==e||(u=u.find(":checked")),u&&(u.trigger("change"),t.addClass("um-field-has-changed"))}}function um_field_hide_siblings(){jQuery.each(um_field_conditions,function(e,i){(1<=jQuery('.um-field[data-key="'+e+'"]:hidden').length||"none"===jQuery('.um-field[data-key="'+e+'"]').css("display"))&&jQuery.each(i,function(e,i){jQuery('.um-field[data-key="'+i.owner+'"]').hide()})})}function _hide_in_ie(e){void 0!==jQuery.browser&&jQuery.browser.msie&&e.css({visibility:"hidden"})}function _show_in_ie(e){void 0!==jQuery.browser&&jQuery.browser.msie&&e.css({visibility:"visible"})}function um_init_field_conditions(){var e=[];jQuery(".um-field[data-key]").each(function(){var t=jQuery(this).data("key");e.push(t);var u={};jQuery.each(jQuery(this)[0].attributes,function(e,i){if(-1!==i.name.indexOf("data-cond")){var a=i.name.slice(10),t=a.substring(1,0),n=a.slice(2);void 0===u[t]&&(u[t]={}),u[t][n]=i.value}}),jQuery.each(u,function(e,i){var a={field:{owner:t,action:i.action,parent:i.field,operator:i.operator,value:i.value,condition:{owner:t,action:i.action,operator:i.operator,value:i.value}}};arr_all_conditions.push(a)}),um_field_default_values[jQuery(this).data("key")]=um_get_field_default_value(jQuery(this))}),jQuery.each(e,function(e,i){um_field_conditions[i]=um_get_field_children(i)}),jQuery(".um-field[data-key]:visible").each(function(){var e=um_get_field_element(jQuery(this));void 0!==e.trigger&&e.trigger("change")})}jQuery(document).ready(function(){jQuery(document).on("change",'.um-field select, .um-field input[type="radio"], .um-field input[type="checkbox"]',function(){um_apply_conditions(jQuery(this),!1)}),jQuery(document).on("input change",'.um-field input[type="text"]',function(){um_apply_conditions(jQuery(this),!1)}),jQuery(document).on("input change",'.um-field input[type="number"]',function(){um_apply_conditions(jQuery(this),!1)}),jQuery(document).on("input change",'.um-field input[type="password"]',function(){um_apply_conditions(jQuery(this),!1)}),jQuery(document).on("um_fields_change",function(){um_field_hide_siblings(),um_field_hide_siblings()}),um_init_field_conditions()});
\ No newline at end of file
+var arr_all_conditions=[],um_field_conditions={},um_field_default_values={};function um_get_field_default_value(e){var i,n="",t=um_get_field_type(e);switch(t){case"text":case"number":case"date":case"textarea":case"select":n=e.find('input:text,input[type="number"],textarea,select').val();break;case"multiselect":n=e.find("select").val();break;case"radio":1<=e.find('input[type="radio"]:checked').length&&(n=e.find('input[type="radio"]:checked').val());break;case"checkbox":1<=e.find('input[type="checkbox"]:checked').length&&(n=1<e.find('input[type="checkbox"]:checked').length?((i=[]).push(n),e.find('input[type="checkbox"]:checked').each(function(){i.push(jQuery(this).val())}),i):e.find('input[type="checkbox"]:checked').val());break;default:n=wp.hooks.applyFilters("um_conditional_logic_default_value",n,t,e)}return{type:t,value:n}}function um_get_field_element(e){var i=e.find("input,textarea,select"),n=um_get_field_type(e);return i=wp.hooks.applyFilters("um_conditional_logic_field_element",i,n,e)}function um_get_field_type(e){var n="",i=e.attr("class").split(" ");return jQuery.each(i,function(e,i){/um-field-type_/.test(i)&&(n=i.replace("um-field-type_","").trim())}),n}function um_get_field_children(n){var t=[];return jQuery.each(arr_all_conditions,function(e,i){i.field.parent===n&&t.push(i.field.condition)}),t}function um_splitup_array(e,i){for(var n=e.length%i,t=n,a=Math.floor(e.length/i),u=[],o=0;o<e.length;o+=a){var r=a+o,d=!1;0!=n&&t&&(r++,t--,d=!0),u.push(e.slice(o,r)),d&&o++}var c=[];return jQuery.each(u,function(e,i){c.push({action:i[0],if_field:i[1],operator:i[2],value:i[3]})}),c}function um_get_field_data(e){return um_live_field=e.parents(".um-field").data("key"),um_live_value=e.val(),e.is(":checkbox")&&(um_live_value="",1<e.parents(".um-field").find("input:checked").length?e.parents(".um-field").find("input:checked").each(function(){um_live_value=um_live_value+jQuery(this).val()+" "}):1<=e.parents(".um-field").find("input:checked").length&&(um_live_value=e.parents(".um-field").find("input:checked").val())),e.is(":radio")&&(um_live_value=e.parents(".um-field").find("input[type=radio]:checked").val()),um_live_value}function um_in_array(e,i,n){var t,a=!1;for(t in n=!!n,i)if(n&&i[t]===e||!n&&i[t]==e){a=!0;break}return a}function um_apply_conditions(n,e){var i,t,a,u,o,r,d;n.parents(".um-field[data-key]").length&&(i=n.parents(".um-field[data-key]").data("key"),void 0!==(t=um_field_conditions[i])&&(a=um_get_field_type(n.parents(".um-field[data-key]")),u=um_get_field_data(n),o={},r={},d={},jQuery.each(t,function(e,i){void 0===r[i.owner]&&(r[i.owner]=[],d[i.owner]={}),r[i.owner].push(i.value),d[i.owner]=i}),jQuery.each(t,function(e,i){var n;if(void 0===o[i.owner]&&(o[i.owner]={}),"empty"===i.operator&&(n=jQuery.isArray(u)?u.join(""):u,o[i.owner][e]=!n||""===n),"not empty"===i.operator&&(n=jQuery.isArray(u)?u.join(""):u,o[i.owner][e]=!(!n||""===n)),"equals to"===i.operator&&(n=jQuery.isArray(u)&&1===u.length?u[0]:u,i.value===n&&um_in_array(n,r[i.owner])?o[i.owner][e]=!0:o[i.owner][e]=!1),"not equals"===i.operator&&(n=jQuery.isArray(u)&&1===u.length?u[0]:u,(!jQuery.isNumeric(i.value)||parseInt(n)===parseInt(i.value)||!n||um_in_array(n,r[i.owner]))&&(i.value==n||um_in_array(n,r[i.owner]))?o[i.owner][e]=!1:o[i.owner][e]=!0),"greater than"===i.operator&&(n=jQuery.isArray(u)&&1===u.length?u[0]:u,jQuery.isNumeric(i.value)&&parseInt(n)>parseInt(i.value)?o[i.owner][e]=!0:o[i.owner][e]=!1),"less than"===i.operator&&(n=jQuery.isArray(u)&&1===u.length?u[0]:u,jQuery.isNumeric(i.value)&&parseInt(n)<parseInt(i.value)?o[i.owner][e]=!0:o[i.owner][e]=!1),"contains"===i.operator)switch(a){case"multiselect":u&&0<=u.indexOf(i.value)&&um_in_array(i.value,u)?o[i.owner][e]=!0:o[i.owner][e]=!1;break;case"checkbox":u&&0<=u.indexOf(i.value)?o[i.owner][e]=!0:o[i.owner][e]=!1;break;default:void 0===(o=wp.hooks.applyFilters("um_conditional_logic_contains_operator_owners",o,a,u,i,e))[i.owner][e]&&(u&&0<=u.indexOf(i.value)&&um_in_array(u,r[i.owner])?o[i.owner][e]=!0:o[i.owner][e]=!1)}}),jQuery.each(o,function(e,i){um_in_array(!0,i)?um_field_apply_action(n,d[e],!0):um_field_apply_action(n,d[e],!1)}),n.trigger("um_fields_change")))}function um_field_apply_action(e,i,n){var t=jQuery('div.um-field[data-key="'+i.owner+'"]');return"show"===i.action&&n&&(t.show(),_show_in_ie(t),um_field_restore_default_value(t)),"show"!==i.action||n||(t.hide(),_hide_in_ie(t)),"hide"===i.action&&n&&(t.hide(),_hide_in_ie(t)),"hide"!==i.action||n||(t.show(),_show_in_ie(t),um_field_restore_default_value(t)),e.removeClass("um-field-has-changed")}function um_field_restore_default_value(t){var e,i,n=um_get_field_type(t),a=t.data("key"),u=um_field_default_values[a];switch(n){case"text":case"number":case"date":case"textarea":t.find('input:text,input[type="number"],textareas').val(u.value);break;case"select":t.find("select").find("option").prop("selected",!1),t.find("select").val(u.value),t.find("select").trigger("change");break;case"multiselect":t.find("select").find("option").prop("selected",!1),jQuery.each(u.value,function(e,i){t.find("select").find('option[value="'+i+'"]').attr("selected",!0)}),t.find("select").trigger("change");break;case"checkbox":1<=t.find('input[type="checkbox"]:checked').length&&(t.find('input[type="checkbox"]:checked').removeAttr("checked"),t.find("span.um-field-checkbox-state i").removeClass("um-icon-android-checkbox-outline"),t.find("span.um-field-checkbox-state i").addClass("um-icon-android-checkbox-outline-blank"),t.find(".um-field-checkbox.active").removeClass("active"),jQuery.isArray(u.value)?jQuery.each(u.value,function(e,i){var n=t.find('input[type="checkbox"][value="'+i+'"]');n.attr("checked",!0),n.closest(".um-field-checkbox").find("i").removeClass("um-icon-android-checkbox-outline-blank"),n.closest(".um-field-checkbox").find("i").addClass("um-icon-android-checkbox-outline"),n.closest(".um-field-checkbox").addClass("active")}):((e=t.find('input[type="checkbox"][value="'+u.value+'"]')).attr("checked",!0),e.closest(".um-field-checkbox").find("i").removeClass("um-icon-android-checkbox-outline-blank"),e.closest(".um-field-checkbox").find("i").addClass("um-icon-android-checkbox-outline"),e.closest(".um-field-checkbox").addClass("active")));break;case"radio":1<=t.find('input[type="radio"]:checked').length&&setTimeout(function(){t.find('input[type="radio"]:checked').removeAttr("checked"),t.find("span.um-field-radio-state i").removeClass("um-icon-android-radio-button-on"),t.find("span.um-field-radio-state i").addClass("um-icon-android-radio-button-off"),t.find(".um-field-radio.active").removeClass("active");var e=t.find('input[type="radio"][value="'+u.value+'"]');e.attr("checked",!0),e.closest(".um-field-radio").find("i").removeClass("um-icon-android-radio-button-off"),e.closest(".um-field-radio").find("i").addClass("um-icon-android-radio-button-on"),e.closest(".um-field-radio").addClass("active")},100);break;default:wp.hooks.doAction("um_conditional_logic_restore_default_value",n,t,u)}t.hasClass("um-field-has-changed")||(i=um_get_field_element(t),"radio"!==n&&"checkbox"!==n||(i=i.find(":checked")),i&&(i.trigger("change"),t.addClass("um-field-has-changed")))}function um_field_hide_siblings(){jQuery.each(um_field_conditions,function(e,i){(1<=jQuery('.um-field[data-key="'+e+'"]:hidden').length||"none"===jQuery('.um-field[data-key="'+e+'"]').css("display"))&&jQuery.each(i,function(e,i){jQuery('.um-field[data-key="'+i.owner+'"]').hide()})})}function _hide_in_ie(e){void 0!==jQuery.browser&&jQuery.browser.msie&&e.css({visibility:"hidden"})}function _show_in_ie(e){void 0!==jQuery.browser&&jQuery.browser.msie&&e.css({visibility:"visible"})}function um_init_field_conditions(){var e=[];jQuery(".um-field[data-key]").each(function(){var t=jQuery(this).data("key");e.push(t);var u={};jQuery.each(jQuery(this)[0].attributes,function(e,i){var n,t,a;-1!==i.name.indexOf("data-cond")&&(t=(n=i.name.slice(10)).substring(1,0),a=n.slice(2),void 0===u[t]&&(u[t]={}),u[t][a]=i.value)}),jQuery.each(u,function(e,i){var n={field:{owner:t,action:i.action,parent:i.field,operator:i.operator,value:i.value,condition:{owner:t,action:i.action,operator:i.operator,value:i.value}}};arr_all_conditions.push(n)}),um_field_default_values[jQuery(this).data("key")]=um_get_field_default_value(jQuery(this))}),jQuery.each(e,function(e,i){um_field_conditions[i]=um_get_field_children(i)}),jQuery(".um-field[data-key]:visible").each(function(){var e=um_get_field_element(jQuery(this));void 0!==e.trigger&&e.trigger("change")})}jQuery(document).ready(function(){jQuery(document).on("change",'.um-field select, .um-field input[type="radio"], .um-field input[type="checkbox"]',function(){um_apply_conditions(jQuery(this),!1)}),jQuery(document).on("input change",'.um-field input[type="text"]',function(){um_apply_conditions(jQuery(this),!1)}),jQuery(document).on("input change",'.um-field input[type="number"]',function(){um_apply_conditions(jQuery(this),!1)}),jQuery(document).on("input change",'.um-field input[type="password"]',function(){um_apply_conditions(jQuery(this),!1)}),jQuery(document).on("um_fields_change",function(){um_field_hide_siblings(),um_field_hide_siblings()}),um_init_field_conditions()});
\ No newline at end of file