diff --git a/README b/README
index e10800d..7a46d4c 100644
--- a/README
+++ b/README
@@ -13,3 +13,8 @@ Some embeded Google Analytics Actions modified, this would help me to look into
 
 1.05>
 Urgent bug fixed
+
+1.06>
+More Google Analytics
+Definition become stronger again
+Clear inputs options
diff --git a/bin/background.html b/bin/background.html
index 8f8b942..8002d13 100644
--- a/bin/background.html
+++ b/bin/background.html
@@ -5,13 +5,17 @@
 chrome.extension.onRequest.addListener(
 	function(request, sender, sendResponse) {
 	if(request!=null && request.hasOwnProperty('gag_event')){
-		_gaq.push(['_trackEvent', request['gag_category'], request['gag_event']]);
+		chrome.tabs.getSelected(null, function(tab){
+			_gaq.push(['_trackEvent', request['gag_category'], request['gag_event'], tab.url]);
+		});
 	}else{
 		sendResponse({result: localStorage});
 	}
 });
 chrome.browserAction.onClicked.addListener(function(){
-	_gaq.push(['_trackEvent', 'fillFunction', 'browserAction']);
+	chrome.tabs.getSelected(null, function(tab){
+		_gaq.push(['_trackEvent', 'fillFunction', 'browserAction', tab.url]);
+	});
 	chrome.tabs.executeScript(null, {code:'window.vG.scanTheDomAndMakeSomeMagic();'});
 });
 var _gaq = _gaq || [];
diff --git a/bin/magicfill.js b/bin/magicfill.js
index 9eafa5d..43e5b1f 100644
--- a/bin/magicfill.js
+++ b/bin/magicfill.js
@@ -42,7 +42,7 @@ function magicInputsOptions(){
 
 				this.setOption('EMAIL',['mail'], storage);
 				this.setOption('CONFIRM',['confirm'], storage);
-				this.setOption('NUMBER',['numb', 'integer', 'price', 'size', 'code'], storage);
+				this.setOption('NUMBER',['numb', 'integer', 'price', 'size', 'qty', 'code'], storage);
 
 				this.setOption('CARD_TYPE','random', storage);
 				this.setOption('ISCREDITCARDNUMBER',['cc_number', 'cc-number', 'cardnumber', 'credit_card'], storage);
@@ -71,6 +71,8 @@ function magicInputsOptions(){
 				this.setOption('CONSONANTS',['b','c','d','f','g','h','j','k','l','m','n','p','r','s','t','v','w','x','z','ch','sh','fr','th','q','k', 'l','m','n','p','s','t','b','c','d','f','g'], storage);
 				this.setOption('VOWELS',['a','e','i','o','u','y','a','e','i','o','u','y','oo', 'ou', 'ae', 'ea'], storage);
 				this.setOption('TARGET_BLANK_FORMS', false, storage);
+
+				this.setOption('CLEAR_INPUTS_EVENTS', true, storage);
 		}
 		//Put presetted to defaults
 		this.setHardcodedOptions(this.defaultOptions);
@@ -187,10 +189,18 @@ function valueGenerator(){
 			return ar[Math.floor(Math.random()*ar.length)];
 		}
 
+		//removes event 
+		this.removeEvent=function(el, actualEventName){
+			  if (element.removeEventListener)
+				element.removeEventListener(actualEventName, responder, false);
+			  else
+				element.detachEvent('on' + actualEventName, responder);
+		}
+
 		//Is any entries of the string ST equal to any lements of Array AR
 		this.isAnyEqual=function(st, ar){
 			for (elm in ar){
-				if(st.indexOf(ar[elm])>0){
+				if(st.indexOf(ar[elm])>=0){
 					return true;
 				}
 			}
diff --git a/bin/manifest.json b/bin/manifest.json
index 5a58098..d97ad7a 100644
--- a/bin/manifest.json
+++ b/bin/manifest.json
@@ -1,6 +1,6 @@
 {
 	"name": "Magic Inputs Filler",
-	"version": "1.0.5",
+	"version": "1.0.6",
 	"description": "Extension allows you to fill all the inputs, textareas and selects on the page with random values depending on it's type.",
 	"icons": { "16": "images/icon16.png",
 						 "48": "images/icon48.png",
diff --git a/bin/options.html b/bin/options.html
index ba5805a..f021a7b 100644
--- a/bin/options.html
+++ b/bin/options.html
@@ -127,6 +127,10 @@ <h3>Common options</h3>
 					<input type="checkbox" id="targetblank" name="TARGET_BLANK_FORMS" value="targetblank" />
 					<label class="long" for="targetblank">Add <em>TARGET="_blank"</em> attribute to forms</label>
 				</block>
+				<!-- <block class="radiobox">
+					<input type="checkbox" id="clear_inputs_events" name="CLEAR_INPUTS_EVENTS" value="clear_inputs_events" checked="checked" />
+					<label class="long" for="clear_inputs_events">Remove predefined inputs events</label>
+				</block> -->
 			</content>
 		</segment>
 		<buttons>
@@ -141,6 +145,11 @@ <h1>About Magic Inputs</h1>
 	<p>Feel free to <a href="mailto:Serj Alimsky <alimsky@gmail.com>">ask</a> me any questions: </p>
 	<changelog>
 	<h3>Changelog</h2>
+	<h4>1.0.6</h3>
+	<ul>
+		<li>Small issues fixed</li>
+		<li>Definition improved</li>
+	</ul>
 	<h4>1.0.5</h3>
 	<ul>
 		<li>Cross-domain security iFrame bug fixed</li>
diff --git a/bin/options.js b/bin/options.js
index 9b54a68..0ac4deb 100644
--- a/bin/options.js
+++ b/bin/options.js
@@ -112,6 +112,7 @@ $(document).ready(function(){
 
 		$('#targetblank').attr('checked',sts['TARGET_BLANK_FORMS']?'checked':'');
 		$('#captchas_fields').attr('checked',sts['DONT_FILL_CAPTCHAS']?'checked':'');
+		//$('#clear_inputs_events').attr('checked',sts['CLEAR_INPUTS_EVENTS']?'checked':'');
 		
 	}
 
@@ -122,6 +123,7 @@ $(document).ready(function(){
 		$(el).click(function(){ //maybe somebode clicked radioboxes, we should save it
 		  highlightChange(this);
 		  storeOption(this.name, this.value);
+			_gaq.push(['_trackEvent', 'options', this.name]);
 		})
 	});
 	$('input[type=checkbox]').each(function(i,el){
@@ -129,6 +131,7 @@ $(document).ready(function(){
 		$(el).click(function(){ //maybe somebody clicked checkboxes, we should save it
 		  highlightChange(this);
 		  storeOption(this.name, this.checked);
+			_gaq.push(['_trackEvent', 'options', this.name]);
 		})
 	});
 	$('#use_hotkeys').click(function(){
@@ -136,12 +139,14 @@ $(document).ready(function(){
 			$('#hotkey__content block.hotkey *').each(function(i,el){$(el).fadeTo(500,0.5)});	
 		else
 			$('#hotkey__content block.hotkey *').each(function(i,el){$(el).fadeTo(300,1)});	
+		_gaq.push(['_trackEvent', 'options', 'hotkeys clicked']);
 	})
 	$('textarea, input[type=text]').each(function(i,el){
 		if($(el).hasClass('__dont_save')) return;
 		$(el).change(function(){ //maybe somebode changed inputs, we should save it
 		  highlightChange(this);
 		  storeOption(this.name, $(this).val());
+			_gaq.push(['_trackEvent', 'options', this.name]);
 		})
 	});
 	$('textarea.save_as_array, input.save_as_array[type=text]').each(function(i,el){
@@ -150,6 +155,7 @@ $(document).ready(function(){
 		$(el).change(function(){ //maybe somebode changed inputs, we should save it
 		  highlightChange(this);
 		  storeOption(this.name, $(this).val().split(' ').join('').split(','));
+			_gaq.push(['_trackEvent', 'options', this.name]);
 		})
 	});
 	$('#hotkey_typical,	#hotkey_typical_input').mouseup(function(){	//assign typical hotkey