diff --git a/jquery.Thailand.js/dist/jquery.Thailand.min.js b/jquery.Thailand.js/dist/jquery.Thailand.min.js
index 04cdf92..a409494 100644
--- a/jquery.Thailand.js/dist/jquery.Thailand.min.js
+++ b/jquery.Thailand.js/dist/jquery.Thailand.min.js
@@ -1,6 +1,6 @@
 /**
  * @name jquery.Thailand.js
- * @version 1.3.5
+ * @version 1.3.6
  * @update Apr 16, 2017
  * @website https://github.com/earthchie/jquery.Thailand.js
  * @license WTFPL v.2 - http://www.wtfpl.net/
@@ -9,4 +9,5 @@
  *              typeahead.js <https://twitter.github.io/typeahead.js/>
  *              JQL.js <https://github.com/earthchie/JQL.js>
  **/
-$.Thailand=function(a){"use strict";a=$.extend({database:"./db.json",autocomplete_size:20,onLoad:function(){},onDataFill:function(){},$district:!1,$amphoe:!1,$province:!1,$zipcode:!1,$search:!1},a);var b=function(a){function e(a){function e(a){var b=a.charCodeAt(0);return c[b<97?b-65:26+b-97]}return d?("number"==typeof a&&(a=b[a]),a.replace(/[A-Z]/gi,e)):a}var b=[],c=[],d=!1;if(a.lookup&&a.words&&(d=!0,b=a.lookup.split("|"),c=a.words.split("|"),a=a.data),!a[0].length)return a;var f=[];return a.forEach(function(a){var b=a[0];a[1].forEach(function(a){var c=a[0];a[1].forEach(function(a){var d=a[0];(a[1]instanceof Array?a[1]:[a[1]]).forEach(function(a){f.push({d:e(d),a:e(c),p:e(b),z:a})})})})}),f},c=function(a,b,d){a+="",b+="";var j,k,l,m,e=0,f=0,g=0,h=a.length,i=b.length;for(j=0;j<h;j++)for(k=0;k<i;k++){for(l=0;j+l<h&&k+l<i&&a.charAt(j+l)===b.charAt(k+l);l++);l>g&&(g=l,e=j,f=k)}return m=g,m&&(e&&f&&(m+=c(a.substr(0,f),b.substr(0,f),!1)),e+g<h&&f+g<i&&(m+=c(a.substr(e+g,h-e-g),b.substr(f+g,i-f-g),!1))),!1===d?m:a===b?100:h>i?Math.floor(m/h*100):Math.floor(m/i*100)};$.getJSON(a.database,function(d){var e=new JQL(b(d)),f={hint:!0,highlight:!0,minLength:1},g={empty:" ",suggestion:function(a){return"<div>"+a.d+" » "+a.a+" » "+a.p+" » "+(a.z||"<i>ไม่มีรหัสไปรษณีย์</i>")+"</div>"}},h=function(b,c){a.$district&&a.$district.val(c.d).trigger("change"),a.$amphoe&&a.$amphoe.val(c.a).trigger("change"),a.$province&&a.$province.val(c.p).trigger("change"),a.$zipcode&&a.$zipcode.val(c.z).trigger("change"),"function"==typeof a.onDataFill&&a.onDataFill({district:c.d,amphoe:c.a,province:c.p,zipcode:c.z})};a.$district&&a.$district.typeahead(f,{limit:a.autocomplete_size,templates:g,source:function(a,b){var c=[];try{c=e.select("*").where("d").match("^"+a).orderBy("d").fetch()}catch(a){}b(c)},display:function(a){return a.d}}),a.$amphoe&&a.$amphoe.typeahead(f,{limit:a.autocomplete_size,templates:g,source:function(a,b){var c=[];try{c=e.select("*").where("a").match("^"+a).orderBy("a").fetch()}catch(a){}b(c)},display:function(a){return a.a}}),a.$province&&a.$province.typeahead(f,{limit:a.autocomplete_size,templates:g,source:function(a,b){var c=[];try{c=e.select("*").where("p").match("^"+a).orderBy("p").fetch()}catch(a){}b(c)},display:function(a){return a.p}}),a.$zipcode&&a.$zipcode.typeahead(f,{limit:a.autocomplete_size,templates:g,source:function(a,b){var c=[];try{c=e.select("*").where("z").match("^"+a).orderBy("z").fetch()}catch(a){}b(c)},display:function(a){return a.z}}),a.$search&&a.$search.typeahead(f,{limit:a.autocomplete_size,templates:g,source:function(a,b){var f,d=[];try{d=new JQL(d.concat(e.select("*").where("d").match(a).fetch()).concat(e.select("*").where("a").match(a).fetch()).concat(e.select("*").where("p").match(a).fetch()).concat(e.select("*").where("z").match(a).fetch()).filter(function(a,b,c){var d=!0;for(f=0;f<c.length;f++)b!==f&&c[f].a==a.d&&c[f].d===a.d&&(d=!1);return d}).map(function(b){return b.likely=[5*c(a,b.d),3*c(a,b.a.replace(/^เมือง/,"")),c(a,b.p),c(a,b.z)].sort(function(a,b){return a-b}).pop(),b})).select("*").orderBy("likely desc").fetch()}catch(a){}b(d)},display:function(a){return""}}),a.$district&&a.$district.bind("typeahead:select typeahead:autocomplete",h),a.$amphoe&&a.$amphoe.bind("typeahead:select typeahead:autocomplete",h),a.$province&&a.$province.bind("typeahead:select typeahead:autocomplete",h),a.$zipcode&&a.$zipcode.bind("typeahead:select typeahead:autocomplete",h),a.$search&&a.$search.bind("typeahead:select typeahead:autocomplete",h),"function"==typeof a.onLoad&&a.onLoad(),"function"==typeof a.onComplete&&a.onComplete()}).fail(function(b){throw new Error('File "'+a.database+'" is not exists.')})};
\ No newline at end of file
+
+$.Thailand=function(a){"use strict";a=$.extend({database:"./db.json",autocomplete_size:20,onLoad:function(){},onDataFill:function(){},$district:!1,$amphoe:!1,$province:!1,$zipcode:!1,$search:!1},a);var b=function(a){function e(a){function e(a){var b=a.charCodeAt(0);return c[b<97?b-65:26+b-97]}return d?("number"==typeof a&&(a=b[a]),a.replace(/[A-Z]/gi,e)):a}var b=[],c=[],d=!1;if(a.lookup&&a.words&&(d=!0,b=a.lookup.split("|"),c=a.words.split("|"),a=a.data),!a[0].length)return a;var f=[];return a.forEach(function(a){var b=a[0];a[1].forEach(function(a){var c=a[0];a[1].forEach(function(a){var d=a[0];(a[1]instanceof Array?a[1]:[a[1]]).forEach(function(a){f.push({d:e(d),a:e(c),p:e(b),z:a})})})})}),f},c=function(a,b,d){a+="",b+="";var j,k,l,m,e=0,f=0,g=0,h=a.length,i=b.length;for(j=0;j<h;j++)for(k=0;k<i;k++){for(l=0;j+l<h&&k+l<i&&a.charAt(j+l)===b.charAt(k+l);l++);l>g&&(g=l,e=j,f=k)}return m=g,m&&(e&&f&&(m+=c(a.substr(0,f),b.substr(0,f),!1)),e+g<h&&f+g<i&&(m+=c(a.substr(e+g,h-e-g),b.substr(f+g,i-f-g),!1))),!1===d?m:a===b?100:h>i?Math.floor(m/h*100):Math.floor(m/i*100)};$.getJSON(a.database,function(d){var e=new JQL(b(d)),f={hint:!0,highlight:!0,minLength:1},g={empty:" ",suggestion:function(a){return"<div>"+a.d+" » "+a.a+" » "+a.p+" » "+(a.z||"<i>ไม่มีรหัสไปรษณีย์</i>")+"</div>"}},h=function(b,c){a.$district&&a.$district.val(c.d).trigger("change"),a.$amphoe&&a.$amphoe.val(c.a).trigger("change"),a.$province&&a.$province.val(c.p).trigger("change"),a.$zipcode&&a.$zipcode.val(c.z).trigger("change"),"function"==typeof a.onDataFill&&a.onDataFill({district:c.d,amphoe:c.a,province:c.p,zipcode:c.z})};a.$district&&a.$district.typeahead(f,{limit:a.autocomplete_size,templates:g,source:function(a,b){var c=[];try{c=e.select("*").where("d").match("^"+a).orderBy("d").fetch()}catch(a){}b(c)},display:function(a){return a.d}}),a.$amphoe&&a.$amphoe.typeahead(f,{limit:a.autocomplete_size,templates:g,source:function(a,b){var c=[];try{c=e.select("*").where("a").match("^"+a).orderBy("a").fetch()}catch(a){}b(c)},display:function(a){return a.a}}),a.$province&&a.$province.typeahead(f,{limit:a.autocomplete_size,templates:g,source:function(a,b){var c=[];try{c=e.select("*").where("p").match("^"+a).orderBy("p").fetch()}catch(a){}b(c)},display:function(a){return a.p}}),a.$zipcode&&a.$zipcode.typeahead(f,{limit:a.autocomplete_size,templates:g,source:function(a,b){var c=[];try{c=e.select("*").where("z").match("^"+a).orderBy("z").fetch()}catch(a){}b(c)},display:function(a){return a.z}}),a.$search&&a.$search.typeahead({hint:!0,highlight:!0,minLength:2},{limit:a.autocomplete_size,templates:g,source:function(a,b){var f,d=[];try{d=new JQL(d.concat(e.select("*").where("d").match(a).fetch()).concat(e.select("*").where("a").match(a).fetch()).concat(e.select("*").where("p").match(a).fetch()).concat(e.select("*").where("z").match(a).fetch()).filter(function(a,b,c){var d=!0;for(f=0;f<c.length;f++)b!==f&&c[f].a==a.d&&c[f].d===a.d&&(d=!1);return d}).map(function(b){return b.likely=[5*c(a,b.d),3*c(a,b.a.replace(/^เมือง/,"")),c(a,b.p),c(a,b.z)].sort(function(a,b){return a-b}).pop(),b})).select("*").orderBy("likely desc").fetch()}catch(a){}b(d)},display:function(a){return""}}),a.$district&&a.$district.bind("typeahead:select typeahead:autocomplete",h),a.$amphoe&&a.$amphoe.bind("typeahead:select typeahead:autocomplete",h),a.$province&&a.$province.bind("typeahead:select typeahead:autocomplete",h),a.$zipcode&&a.$zipcode.bind("typeahead:select typeahead:autocomplete",h),a.$search&&a.$search.bind("typeahead:select typeahead:autocomplete",h),"function"==typeof a.onLoad&&a.onLoad(),"function"==typeof a.onComplete&&a.onComplete()}).fail(function(b){throw new Error('File "'+a.database+'" is not exists.')})};
\ No newline at end of file
diff --git a/jquery.Thailand.js/src/jquery.Thailand.js b/jquery.Thailand.js/src/jquery.Thailand.js
index e8b091d..0ae2a54 100644
--- a/jquery.Thailand.js/src/jquery.Thailand.js
+++ b/jquery.Thailand.js/src/jquery.Thailand.js
@@ -1,6 +1,6 @@
 /**
  * @name jquery.Thailand.js
- * @version 1.3.5
+ * @version 1.3.6
  * @update Apr 16, 2017
  * @website https://github.com/earthchie/jquery.Thailand.js
  * @license WTFPL v.2 - http://www.wtfpl.net/
@@ -250,7 +250,11 @@ $.Thailand = function (options) {
             }
 
             if (options.$search) {
-                options.$search.typeahead(typehead_options, {
+                options.$search.typeahead({
+                    hint: true,
+                    highlight: true,
+                    minLength: 2
+                }, {
                     limit: options.autocomplete_size,
                     templates: templates,
                     source: function (str, callback) {