diff --git a/datalist-polyfill.js b/datalist-polyfill.js
index 4b8b610..922a851 100644
--- a/datalist-polyfill.js
+++ b/datalist-polyfill.js
@@ -86,7 +86,7 @@
 					'input[list="' + datalistNeedsAnUpdate.id + '"]'
 				);
 
-				if (input.value !== '') {
+				if (getInputValue(input) !== '') {
 					// Prepare the options and toggle the visiblity afterwards
 					toggleVisibility(
 						prepOptions(datalistNeedsAnUpdate, input).length,
@@ -114,7 +114,7 @@
 		if (isGteIE10 || isEDGE) {
 			// On keypress check for value
 			if (
-				input.value !== '' &&
+				getInputValue(input) !== '' &&
 				!keyOpen &&
 				event.keyCode !== keyENTER &&
 				event.keyCode !== keyESC
@@ -137,7 +137,7 @@
 		if (
 			event.keyCode !== keyESC &&
 			event.keyCode !== keyENTER &&
-			(input.value !== '' || keyOpen) &&
+			(getInputValue(input) !== '' || keyOpen) &&
 			datalistSelect !== undefined
 		) {
 			// ... prepare the options
@@ -166,6 +166,8 @@
 
 	// On keypress check all options for that as a substring, save the original value as a data-attribute and preset that inputs value (for sorting) for all option values (probably as well enhanced by a token)
 	var updateIEOptions = function(input, datalist) {
+		var inputValue = getInputValue(input);
+
 		// Loop through the options
 		Array.prototype.slice.call(datalist.options, 0).forEach(function(option) {
 			var originalValue = option.dataset.originalvalue || option.value;
@@ -187,8 +189,8 @@
 				- and the original string, that is still necessary e.g. for sorting within the suggestions list
 			As the value is being inserted on users selection, we'll replace that one within the upfollowing inputInputListIE function
 			*/
-			option.value = isValidSuggestion(option, input.value)
-				? input.value + uniquePolyfillString + originalValue.toLowerCase()
+			option.value = isValidSuggestion(option, inputValue)
+				? inputValue + uniquePolyfillString + originalValue.toLowerCase()
 				: originalValue;
 		});
 	};
@@ -208,11 +210,11 @@
 
 		// Query for related option - and escaping the value as doublequotes wouldn't work
 		var option = datalist.querySelector(
-			'option[value="' + input.value.replace(/\\([\s\S])|(")/g, '\\$1$2') + '"]'
+			'option[value="' + getInputValue(input).replace(/\\([\s\S])|(")/g, '\\$1$2') + '"]'
 		);
 
 		if (option && option.dataset.originalvalue) {
-			input.value = option.dataset.originalvalue;
+			setInputValue(input, option.dataset.originalvalue);
 		}
 	};
 
@@ -276,7 +278,7 @@
 			visible =
 				datalistSelect &&
 				datalistSelect.querySelector('option:not(:disabled)') &&
-				((event.type === 'focusin' && input.value !== '') ||
+				((event.type === 'focusin' && getInputValue(input) !== '') ||
 					(event.relatedTarget && event.relatedTarget === datalistSelect));
 
 		// Toggle the visibility of the datalist select according to previous checks
@@ -317,6 +319,30 @@
 		input.className += ' ' + classNameInput;
 	};
 
+	// Get the input value for dividing regular and mail types
+	var getInputValue = function(input) {
+		// In case of type=email and multiple attribute, we would need to grab the last piece
+		// Using .getAttribute here for IE9 purpose - elsewhere it wouldn't return the newer HTML5 values correctly
+		return (
+			input.getAttribute('type') === 'email' &&
+			input.getAttribute('multiple') !== null
+		) ? input.value.substring(input.value.lastIndexOf(',') + 1) : input.value;
+	};
+
+	// Set the input value for dividing regular and mail types
+	var setInputValue = function(input, datalistSelectValue) {
+		var lastSeperator;
+
+		// In case of type=email and multiple attribute, we need to set up the resulting inputs value differently
+		input.value =
+			// Using .getAttribute here for IE9 purpose - elsewhere it wouldn't return the newer HTML5 values correctly
+			input.getAttribute('type') === 'email' &&
+			input.getAttribute('multiple') !== null &&
+			(lastSeperator = input.value.lastIndexOf(',')) > -1
+				? input.value.slice(0, lastSeperator) + ',' + datalistSelectValue
+				: datalistSelectValue;
+	};
+
 	// Binding the focus event - matching the input[list]s happens in the function afterwards
 	dcmnt.addEventListener('focusin', changesInputList, true);
 
@@ -335,19 +361,10 @@
 			datalistSelect =
 				datalist.getElementsByClassName(classNamePolyfillingSelect)[0] ||
 				setUpPolyfillingSelect(input, datalist),
-			inputValue = input.value,
+			inputValue = getInputValue(input),
 			newSelectValues = dcmnt.createDocumentFragment(),
 			disabledValues = dcmnt.createDocumentFragment();
 
-		// In case of type=email and multiple attribute, we would need to grab the last piece
-		// Using .getAttribute here for IE9 purpose - elsewhere it wouldn't return the newer HTML5 values correctly
-		if (
-			input.getAttribute('type') === 'email' &&
-			input.getAttribute('multiple') !== null
-		) {
-			inputValue = inputValue.substring(inputValue.lastIndexOf(',') + 1);
-		}
-
 		// Create an array out of the options list
 		Array.prototype.slice
 			.call(datalist.querySelectorAll('option:not(:disabled)'))
@@ -567,16 +584,7 @@
 			datalistSelect.value.length > 0 &&
 			datalistSelect.value !== datalist.title
 		) {
-			var lastSeperator;
-
-			// In case of type=email and multiple attribute, we need to set up the resulting inputs value differently
-			input.value =
-				// Using .getAttribute here for IE9 purpose - elsewhere it wouldn't return the newer HTML5 values correctly
-				input.getAttribute('type') === 'email' &&
-				input.getAttribute('multiple') !== null &&
-				(lastSeperator = input.value.lastIndexOf(',')) > -1
-					? input.value.slice(0, lastSeperator) + ',' + datalistSelect.value
-					: datalistSelect.value;
+			setInputValue(input, datalistSelect.value);
 
 			// Dispatch the input event on the related input[list]
 			dispatchInputEvent(input);
diff --git a/datalist-polyfill.min.js b/datalist-polyfill.min.js
index 6c26725..4ad403e 100644
--- a/datalist-polyfill.min.js
+++ b/datalist-polyfill.min.js
@@ -44,9 +44,9 @@ void 0!==a&&(r=new a(function(e){var a=!1;
 // Look through all mutations that just occured
 if(e.forEach(function(e){
 // Look through all added nodes of this mutation
-for(var t=0;t<e.addedNodes.length;++t)"datalist"===e.target.tagName.toLowerCase()&&(a=e.target)}),a){var t=u.querySelector('input[list="'+a.id+'"]');""!==t.value&&
+for(var t=0;t<e.addedNodes.length;++t)"datalist"===e.target.tagName.toLowerCase()&&(a=e.target)}),a){var t=u.querySelector('input[list="'+a.id+'"]');""!==L(t)&&
 // Prepare the options and toggle the visiblity afterwards
-N(L(a,t).length,a.getElementsByClassName(m)[0])}}));
+O(A(a,t).length,a.getElementsByClassName(m)[0])}}));
 // Function regarding the inputs interactions on keyup event
 var n=function(e){var t=e.target,a=t.list,i=e.keyCode===y||e.keyCode===f;
 // Check for whether the events target was an input and still check for an existing instance of the datalist and polyfilling select
@@ -54,23 +54,23 @@ if("input"===t.tagName.toLowerCase()&&null!==a)
 // Handling IE10+ & EDGE
 if(s||d)
 // On keypress check for value
-""===t.value||i||e.keyCode===c||e.keyCode===v||(b(t,a),
+""===L(t)||i||e.keyCode===c||e.keyCode===v||(b(t,a),
 // TODO: Check whether this update is necessary depending on the options values
 t.focus());else{var n=!1,
 // Creating the select if there's no instance so far (e.g. because of that it hasn't been handled or it has been dynamically inserted)
-r=a.getElementsByClassName(m)[0]||k(t,a);
+r=a.getElementsByClassName(m)[0]||x(t,a);
 // On an ESC or ENTER key press within the input, let's break here and afterwards hide the datalist select, but if the input contains a value or one of the opening keys have been pressed ...
-if(e.keyCode!==v&&e.keyCode!==c&&(""!==t.value||i)&&void 0!==r){
+if(e.keyCode!==v&&e.keyCode!==c&&(""!==L(t)||i)&&void 0!==r){
 // ... prepare the options
-0<L(a,t).length&&(n=!0);var o=0,l=r.options.length-1;
+0<A(a,t).length&&(n=!0);var o=0,l=r.options.length-1;
 // ... preselect best fitting index
 p?r.selectedIndex=0:i&&"number"!==t.getAttribute("type")&&(r.selectedIndex=e.keyCode===y?l:0,
 // ... and on arrow up or down keys, focus the select
 r.focus())}
 // Toggle the visibility of the datalist select according to previous checks
-N(n,r)}},b=function(a,e){
+O(n,r)}},b=function(e,t){var a=L(e);
 // Loop through the options
-Array.prototype.slice.call(e.options,0).forEach(function(e){var t=e.dataset.originalvalue||e.value;
+Array.prototype.slice.call(t.options,0).forEach(function(e){var t=e.dataset.originalvalue||e.value;
 // In case of that the original value hasn't been saved as data so far, do that now
 e.dataset.originalvalue||(e.dataset.originalvalue=t),
 // As we'd manipulate the value in the next step, we'd like to put in that value as either a label or text if none of those exist
@@ -81,9 +81,9 @@ e.label||e.text||(e.label=t)
 				- followed by a unique string that should prevent any interferance
 				- and the original string, that is still necessary e.g. for sorting within the suggestions list
 			As the value is being inserted on users selection, we'll replace that one within the upfollowing inputInputListIE function
-			*/,e.value=w(e,a.value)?a.value+i+t.toLowerCase():t})},h=function(e){var t=e.target,a=t.list;if(t.matches("input[list]")&&t.matches("."+o)&&a){
+			*/,e.value=w(e,a)?a+i+t.toLowerCase():t})},h=function(e){var t=e.target,a=t.list;if(t.matches("input[list]")&&t.matches("."+o)&&a){
 // Query for related option - and escaping the value as doublequotes wouldn't work
-var i=a.querySelector('option[value="'+t.value.replace(/\\([\s\S])|(")/g,"\\$1$2")+'"]');i&&i.dataset.originalvalue&&(t.value=i.dataset.originalvalue)}},w=function(e,t){var a=e.value.toLowerCase(),i=t.toLowerCase(),n=e.getAttribute("label"),r=e.text.toLowerCase();
+var i=a.querySelector('option[value="'+L(t).replace(/\\([\s\S])|(")/g,"\\$1$2")+'"]');i&&i.dataset.originalvalue&&k(t,i.dataset.originalvalue)}},w=function(e,t){var a=e.value.toLowerCase(),i=t.toLowerCase(),n=e.getAttribute("label"),r=e.text.toLowerCase();
 /*
 		"Each option element that is a descendant of the datalist element, that is not disabled, and whose value is a string that isn't the empty string, represents a suggestion. Each suggestion has a value and a label."
 		"If appropriate, the user agent should use the suggestion's label and value to identify the suggestion to the user."
@@ -100,11 +100,11 @@ t.matches("."+o)||C(t,e.type),d&&"focusin"===e.type){
 var i=t.list.options[0];i.value=i.value}
 // Break here for IE10+ & EDGE
 if(!s&&!d){var// Creating the select if there's no instance so far (e.g. because of that it hasn't been handled or it has been dynamically inserted)
-n=a.getElementsByClassName(m)[0]||k(t,a),
+n=a.getElementsByClassName(m)[0]||x(t,a),
 // Either have the select set to the state to get displayed in case of that it would have been focused or because it's the target on the inputs blur - and check for general existance of any option as suggestions
-r=n&&n.querySelector("option:not(:disabled)")&&("focusin"===e.type&&""!==t.value||e.relatedTarget&&e.relatedTarget===n);
+r=n&&n.querySelector("option:not(:disabled)")&&("focusin"===e.type&&""!==L(t)||e.relatedTarget&&e.relatedTarget===n);
 // Toggle the visibility of the datalist select according to previous checks
-N(r,n)}}}},C=function(e,t){
+O(r,n)}}}},C=function(e,t){
 // We'd like to prevent autocomplete on the input datalist field
 e.setAttribute("autocomplete","off"),
 // WAI ARIA attributes
@@ -112,18 +112,22 @@ e.setAttribute("role","textbox"),e.setAttribute("aria-haspopup","true"),e.setAtt
 // Bind the keyup event on the related datalists input
 "focusin"===t?(e.addEventListener("keyup",n),e.addEventListener("focusout",E,!0),(s||d)&&e.addEventListener("input",h)):"blur"===t&&(e.removeEventListener("keyup",n),e.removeEventListener("focusout",E,!0),(s||d)&&e.removeEventListener("input",h)),
 // Add class for identifying that this input is even already being polyfilled
-e.className+=" "+o};
+e.className+=" "+o},L=function(e){
+// In case of type=email and multiple attribute, we would need to grab the last piece
+// Using .getAttribute here for IE9 purpose - elsewhere it wouldn't return the newer HTML5 values correctly
+return"email"===e.getAttribute("type")&&null!==e.getAttribute("multiple")?e.value.substring(e.value.lastIndexOf(",")+1):e.value},k=function(e,t){var a;
+// In case of type=email and multiple attribute, we need to set up the resulting inputs value differently
+e.value=
+// Using .getAttribute here for IE9 purpose - elsewhere it wouldn't return the newer HTML5 values correctly
+"email"===e.getAttribute("type")&&null!==e.getAttribute("multiple")&&-1<(a=e.value.lastIndexOf(","))?e.value.slice(0,a)+","+t:t};
 // On keypress check all options for that as a substring, save the original value as a data-attribute and preset that inputs value (for sorting) for all option values (probably as well enhanced by a token)
 // Break here for IE10+ & EDGE
 if(
 // Binding the focus event - matching the input[list]s happens in the function afterwards
 u.addEventListener("focusin",E,!0),!s&&!d){
 // Function for preparing and sorting the options/suggestions
-var L=function(e,n){void 0!==r&&r.disconnect();var// Creating the select if there's no instance so far (e.g. because of that it hasn't been handled or it has been dynamically inserted)
-t=e.getElementsByClassName(m)[0]||k(n,e),o=n.value,l=u.createDocumentFragment(),s=u.createDocumentFragment();
-// In case of type=email and multiple attribute, we would need to grab the last piece
-// Using .getAttribute here for IE9 purpose - elsewhere it wouldn't return the newer HTML5 values correctly
-"email"===n.getAttribute("type")&&null!==n.getAttribute("multiple")&&(o=o.substring(o.lastIndexOf(",")+1)),
+var A=function(e,n){void 0!==r&&r.disconnect();var// Creating the select if there's no instance so far (e.g. because of that it hasn't been handled or it has been dynamically inserted)
+t=e.getElementsByClassName(m)[0]||x(n,e),o=L(n),l=u.createDocumentFragment(),s=u.createDocumentFragment();
 // Create an array out of the options list
 Array.prototype.slice.call(e.querySelectorAll("option:not(:disabled)")).sort(function(e,t){var a=e.value,i=t.value;
 // Using the knowledge that the values are URLs to allow the user to omit the scheme part and perform intelligent matching on the domain name
@@ -140,7 +144,7 @@ s.appendChild(e)}),
 // Input the options fragment into the datalists select
 t.appendChild(l);var a=t.options.length;return t.size=10<a?10:a,t.multiple=!p&&a<2,
 // Input the unused options as siblings next to the select - and differentiate in between the regular, and the IE9 fix syntax upfront
-(e.getElementsByClassName("ie9_fix")[0]||e).appendChild(s),void 0!==r&&r.observe(e,{childList:!0}),t.options},k=function(e,t){
+(e.getElementsByClassName("ie9_fix")[0]||e).appendChild(s),void 0!==r&&r.observe(e,{childList:!0}),t.options},x=function(e,t){
 // Check for whether it's of one of the supported input types defined at the beginning
 // Using .getAttribute here for IE9 purpose - elsewhere it wouldn't return the newer HTML5 values correctly
 // and still check for an existing instance
@@ -153,7 +157,7 @@ if(n.setAttribute("class",m),
 // Set general styling related definitions
 n.style.position="absolute",
 // Initially hiding the datalist select
-N(!1,n),
+O(!1,n),
 // The select itself shouldn't be a possible target for tabbing
 n.setAttribute("tabindex","-1"),
 // WAI ARIA attributes
@@ -171,45 +175,41 @@ n.appendChild(o)}
 // Add select to datalist element ...
 return t.appendChild(n),
 // ... and our upfollowing functions to the related event
-p?n.addEventListener("change",x):n.addEventListener("click",x),n.addEventListener("blur",x),n.addEventListener("keydown",x),n.addEventListener("keypress",A),n}},A=function(e){var t=e.target,a=t.parentNode,i=u.querySelector('input[list="'+a.id+'"]');
+p?n.addEventListener("change",N):n.addEventListener("click",N),n.addEventListener("blur",N),n.addEventListener("keydown",N),n.addEventListener("keypress",T),n}},T=function(e){var t=e.target,a=t.parentNode,i=u.querySelector('input[list="'+a.id+'"]');
 // Check for whether the events target was a select or whether the input doesn't exist
 "select"===t.tagName.toLowerCase()&&null!==i&&(
 // Determine a relevant key - either printable characters (that would have a length of 1) or controlling like Backspace
 !e.key||"Backspace"!==e.key&&1!==e.key.length||(i.focus(),"Backspace"===e.key?(i.value=i.value.substr(0,i.value.length-1),
 // Dispatch the input event on the related input[list]
-T(i)):i.value+=e.key,L(a,i)))},x=function(e){var t=e.currentTarget,a=t.parentNode,i=u.querySelector('input[list="'+a.id+'"]');
+B(i)):i.value+=e.key,A(a,i)))},N=function(e){var t=e.currentTarget,a=t.parentNode,i=u.querySelector('input[list="'+a.id+'"]');
 // Check for whether the events target was a select or whether the input doesn't exist
 if("select"===t.tagName.toLowerCase()&&null!==i){var n=e.type,
 // ENTER and ESC
-r="keydown"===n&&e.keyCode!==c&&e.keyCode!==v,o;
+r="keydown"===n&&e.keyCode!==c&&e.keyCode!==v;
 // On change, click or after pressing ENTER or TAB key, input the selects value into the input on a change within the list
-if(("change"===n||"click"===n||"keydown"===n&&(e.keyCode===c||"Tab"===e.key))&&0<t.value.length&&t.value!==a.title)
-// In case of type=email and multiple attribute, we need to set up the resulting inputs value differently
-i.value=
-// Using .getAttribute here for IE9 purpose - elsewhere it wouldn't return the newer HTML5 values correctly
-"email"===i.getAttribute("type")&&null!==i.getAttribute("multiple")&&-1<(o=i.value.lastIndexOf(","))?i.value.slice(0,o)+","+t.value:t.value,
+("change"===n||"click"===n||"keydown"===n&&(e.keyCode===c||"Tab"===e.key))&&0<t.value.length&&t.value!==a.title?(k(i,t.value),
 // Dispatch the input event on the related input[list]
-T(i),
+B(i),
 // Finally focusing the input, as other browser do this as well
 "Tab"!==e.key&&i.focus(),
 // #GH-51 / Prevent the form to be submitted on selecting a value via ENTER key within the select
 e.keyCode===c&&e.preventDefault(),
 // Set the visibility to false afterwards, as we're done here
-r=!1;else"keydown"===n&&e.keyCode===v&&
+r=!1):"keydown"===n&&e.keyCode===v&&
 // In case of the ESC key being pressed, we still want to focus the input[list]
-i.focus();
+i.focus(),
 // Toggle the visibility of the datalist select according to previous checks
-N(r,t)}},T=function(e){var t;"function"==typeof Event?t=new Event("input",{bubbles:!0}):(t=u.createEvent("Event")).initEvent("input",!0,!1),e.dispatchEvent(t)},N=function(e,t){e?t.removeAttribute("hidden"):t.setAttributeNode(u.createAttribute("hidden")),t.setAttribute("aria-hidden",(!e).toString())},B,O;
+O(r,t)}},B=function(e){var t;"function"==typeof Event?t=new Event("input",{bubbles:!0}):(t=u.createEvent("Event")).initEvent("input",!0,!1),e.dispatchEvent(t)},O=function(e,t){e?t.removeAttribute("hidden"):t.setAttributeNode(u.createAttribute("hidden")),t.setAttribute("aria-hidden",(!e).toString())},S,P;
 // Define function for setting up the polyfilling select
 (
 // Emulate the two properties regarding the datalist and input elements
 // list property / https://developer.mozilla.org/en/docs/Web/API/HTMLInputElement
-B=window.HTMLInputElement)&&B.prototype&&void 0===B.prototype.list&&Object.defineProperty(B.prototype,"list",{get:function(){
+S=window.HTMLInputElement)&&S.prototype&&void 0===S.prototype.list&&Object.defineProperty(S.prototype,"list",{get:function(){
 /*
 					According to the specs ...
 					"The list IDL attribute must return the current suggestions source element, if any, or null otherwise."
 					"If there is no list attribute, or if there is no element with that ID, or if the first element with that ID is not a datalist element, then there is no suggestions source element."
 					*/
-var e=u.getElementById(this.getAttribute("list"));return"object"==typeof this&&this instanceof B&&e&&e.matches("datalist")?e:null}}),(
+var e=u.getElementById(this.getAttribute("list"));return"object"==typeof this&&this instanceof S&&e&&e.matches("datalist")?e:null}}),(
 // Options property / https://developer.mozilla.org/en/docs/Web/API/HTMLDataListElement
-O=window.HTMLElement)&&O.prototype&&void 0===O.prototype.options&&Object.defineProperty(O.prototype,"options",{get:function(){return"object"==typeof this&&this instanceof O?this.getElementsByTagName("option"):null}})}}();
\ No newline at end of file
+P=window.HTMLElement)&&P.prototype&&void 0===P.prototype.options&&Object.defineProperty(P.prototype,"options",{get:function(){return"object"==typeof this&&this instanceof P?this.getElementsByTagName("option"):null}})}}();
\ No newline at end of file