diff --git a/.env.example b/.env.example
index 20c977c663e9..66d2d5251b27 100644
--- a/.env.example
+++ b/.env.example
@@ -20,11 +20,25 @@ MAIL_FROM_ADDRESS
 MAIL_FROM_NAME
 MAIL_PASSWORD
 
+#POSTMARK_API_TOKEN=
+
 PHANTOMJS_CLOUD_KEY='a-demo-key-with-low-quota-per-ip-address'
 LOG=single
 REQUIRE_HTTPS=false
 API_SECRET=password
 
-GOOGLE_CLIENT_ID
-GOOGLE_CLIENT_SECRET
-GOOGLE_OAUTH_REDIRECT=http://ninja.dev/auth/google
\ No newline at end of file
+#TRUSTED_PROXIES=
+
+#SESSION_DRIVER=
+#SESSION_DOMAIN=
+#SESSION_ENCRYPT=
+#SESSION_SECURE=
+
+#CACHE_DRIVER=
+#CACHE_HOST=
+#CACHE_PORT1=
+#CACHE_PORT2=
+
+#GOOGLE_CLIENT_ID=
+#GOOGLE_CLIENT_SECRET=
+#GOOGLE_OAUTH_REDIRECT=http://ninja.dev/auth/google
\ No newline at end of file
diff --git a/app/Ninja/Repositories/AccountRepository.php b/app/Ninja/Repositories/AccountRepository.php
index 42bef1d1e5d7..10e21fd66745 100644
--- a/app/Ninja/Repositories/AccountRepository.php
+++ b/app/Ninja/Repositories/AccountRepository.php
@@ -189,7 +189,7 @@ class AccountRepository
         return $invitation;
     }
 
-    public function createNinjaInvoice($client, $account)
+    public function createNinjaInvoice($client, $clientAccount)
     {
         $account = $this->getNinjaAccount();
         $lastInvoice = Invoice::withTrashed()->whereAccountId($account->id)->orderBy('public_id', 'DESC')->first();
@@ -201,7 +201,7 @@ class AccountRepository
         $invoice->public_id = $publicId;
         $invoice->client_id = $client->id;
         $invoice->invoice_number = $account->getNextInvoiceNumber($invoice);
-        $invoice->invoice_date = $account->getRenewalDate();
+        $invoice->invoice_date = $clientAccount->getRenewalDate();
         $invoice->amount = PRO_PLAN_PRICE;
         $invoice->balance = PRO_PLAN_PRICE;
         $invoice->save();
diff --git a/app/Ninja/Repositories/ClientRepository.php b/app/Ninja/Repositories/ClientRepository.php
index 324d62a45943..2e8ce31b5c1c 100644
--- a/app/Ninja/Repositories/ClientRepository.php
+++ b/app/Ninja/Repositories/ClientRepository.php
@@ -1,6 +1,7 @@
 <?php namespace App\Ninja\Repositories;
 
 use DB;
+use Cache;
 use App\Ninja\Repositories\BaseRepository;
 use App\Models\Client;
 use App\Models\Contact;
@@ -74,6 +75,17 @@ class ClientRepository extends BaseRepository
             $client = Client::scope($publicId)->with('contacts')->firstOrFail();
         }
 
+        // convert currency code to id
+        if (isset($data['currency_code'])) {
+            $currencyCode = strtolower($data['currency_code']);
+            $currency = Cache::get('currencies')->filter(function($item) use ($currencyCode) {
+                return strtolower($item->code) == $currencyCode;
+            })->first();
+            if ($currency) {
+                $data['currency_id'] = $currency->id;
+            }
+        }
+
         $client->fill($data);
         $client->save();
 
diff --git a/public/built.js b/public/built.js
index cfb777e86e0e..5e28b8fb3f18 100644
--- a/public/built.js
+++ b/public/built.js
@@ -30967,6 +30967,29 @@ function prettyJson(json) {
         return '<span class="' + cls + '">' + match + '</span>';
     });
 }
+
+function searchData(data, key, fuzzy) {
+    return function findMatches(q, cb) {
+    var matches, substringRegex;
+    if (fuzzy) {
+        var options = {
+          keys: [key],
+        }
+        var fuse = new Fuse(data, options);
+        matches = fuse.search(q);
+    } else {
+        matches = [];
+        substrRegex = new RegExp(q, 'i');
+        $.each(data, function(i, obj) {
+          if (substrRegex.test(obj[key])) {
+            matches.push(obj);
+          }
+        });
+    }
+    cb(matches);
+    }
+}; 
+
 var NINJA = NINJA || {};
 
 NINJA.TEMPLATES = {
diff --git a/public/css/built.css b/public/css/built.css
index 8fc151f77508..d4b3a8204e6b 100644
--- a/public/css/built.css
+++ b/public/css/built.css
@@ -2060,7 +2060,7 @@ See http://bgrins.github.io/spectrum/themes/ for instructions.
 
 /*root typeahead class*/
 .twitter-typeahead {
-    display: inherit !important;
+    /*display: inherit !important;*/
     width: 100%;
 }
 
diff --git a/public/css/typeahead.js-bootstrap.css b/public/css/typeahead.js-bootstrap.css
index da8cbf605407..9f4125d18e34 100644
--- a/public/css/typeahead.js-bootstrap.css
+++ b/public/css/typeahead.js-bootstrap.css
@@ -4,7 +4,7 @@
 
 /*root typeahead class*/
 .twitter-typeahead {
-    display: inherit !important;
+    /*display: inherit !important;*/
     width: 100%;
 }
 
diff --git a/public/js/script.js b/public/js/script.js
index a8201d3c427e..67031a5fe3c9 100644
--- a/public/js/script.js
+++ b/public/js/script.js
@@ -1074,4 +1074,26 @@ function prettyJson(json) {
         match = snakeToCamel(match);
         return '<span class="' + cls + '">' + match + '</span>';
     });
-}
\ No newline at end of file
+}
+
+function searchData(data, key, fuzzy) {
+    return function findMatches(q, cb) {
+    var matches, substringRegex;
+    if (fuzzy) {
+        var options = {
+          keys: [key],
+        }
+        var fuse = new Fuse(data, options);
+        matches = fuse.search(q);
+    } else {
+        matches = [];
+        substrRegex = new RegExp(q, 'i');
+        $.each(data, function(i, obj) {
+          if (substrRegex.test(obj[key])) {
+            matches.push(obj);
+          }
+        });
+    }
+    cb(matches);
+    }
+}; 
diff --git a/resources/views/header.blade.php b/resources/views/header.blade.php
index 9f9c3aa3ed3b..f541eec53329 100644
--- a/resources/views/header.blade.php
+++ b/resources/views/header.blade.php
@@ -259,13 +259,11 @@
   }
 
   function showSearch() {
-    console.log('showSearch..');
-    //$('#search').typeahead('setQuery', '');
+    $('#search').typeahead('val', '');
     $('#navbar-options').hide();
     $('#search-form').show();
 
     if (window.hasOwnProperty('loadedSearchData')) {
-        console.log('has data');
         $('#search').focus();
     } else {
         trackEvent('/activity', '/search');
@@ -275,68 +273,24 @@
           $('#search').typeahead({
             hint: true,
             highlight: true,
-          },
-          {
+          }
+          @foreach (['clients', 'contacts', 'invoices', 'quotes', 'navigation'] as $type)
+          ,{
             name: 'data',
             display: 'value',
-            source: searchData(data['clients']),
+            source: searchData(data['{{ $type }}'], 'value', true),
             templates: {
-              header: '&nbsp;<b>{{ trans('texts.clients') }}</b>'
+              header: '&nbsp;<span style="font-weight:600;font-size:16px">{{ trans("texts.{$type}") }}</span>'
             }
-          },
-          {
-            name: 'data',
-            display: 'value',
-            source: searchData(data['contacts']),
-            templates: {
-              header: '&nbsp;<b>{{ trans('texts.contacts') }}</b>'
-            }
-          },
-          {
-            name: 'data',
-            display: 'value',
-            source: searchData(data['invoices']),
-            templates: {
-              header: '&nbsp;<b>{{ trans('texts.contacts') }}</b>'
-            }
-          },
-          {
-            name: 'data',
-            display: 'value',
-            source: searchData(data['quotes']),
-            templates: {
-              header: '&nbsp;<b>{{ trans('texts.quotes') }}</b>'
-            }
-          },
-          {
-            name: 'data',
-            display: 'value',
-            source: searchData(data['navigation']),
-            templates: {
-              header: '&nbsp;<b>{{ trans('texts.navigation') }}</b>'
-            }
-          }).on('typeahead:selected', function(element, datum, name) {
+          }
+          @endforeach
+          ).on('typeahead:selected', function(element, datum, name) {
             window.location = datum.url;
           }).focus(); 
-
-          //.typeahead('setQuery', $('#search').val());
         });
     }
   }
-
-  function searchData(data) {
-      return function findMatches(q, cb) {
-        
-        var options = {
-          keys: ['value'],
-        }
-        var fuse = new Fuse(data, options);
-        var matches = fuse.search(q);
-
-        cb(matches);
-      }
-  }; 
-
+  
   function hideSearch() {
     $('#search-form').hide();
     $('#navbar-options').show();
diff --git a/resources/views/invoices/edit.blade.php b/resources/views/invoices/edit.blade.php
index 548cc41e232c..fc09aeaf6249 100644
--- a/resources/views/invoices/edit.blade.php
+++ b/resources/views/invoices/edit.blade.php
@@ -209,11 +209,7 @@
                         $parent.invoice_items().length > 1" class="fa fa-sort"></i>
 				</td>
 				<td>
-                {!! Former::text('product_key')->useDatalist($products->toArray(), 'product_key')
-                        ->data_bind("value: product_key, valueUpdate: 'afterkeydown', attr: {name: 'invoice_items[' + \$index() + '][product_key]'}")
-                        ->addClass('datalist')
-                        ->raw()
-                         !!}
+                    <input id="product_key" type="text" data-bind="typeahead: product_key, items: $root.products, key: 'product_key', valueUpdate: 'afterkeydown', attr: {name: 'invoice_items[' + $index() + '][product_key]'}" class="form-control invoice-item handled"/>
 				</td>
 				<td>
 					<textarea data-bind="value: wrapped_notes, valueUpdate: 'afterkeydown', attr: {name: 'invoice_items[' + $index() + '][notes]'}"
@@ -915,6 +911,9 @@
 	function applyComboboxListeners() {
         var selectorStr = '.invoice-table input, .invoice-table textarea';
 		$(selectorStr).off('change').on('change', function(event) {
+            if ($(event.target).hasClass('handled')) {
+                return;
+            }
             onItemChange();
             refreshPDF(true);
 		});
@@ -930,38 +929,6 @@
                 $(this).height($(this).height()+1);
             };
         });
-
-		@if (Auth::user()->account->fill_products)
-			$('.datalist').off('input').on('input', function() {
-				var key = $(this).val();
-				for (var i=0; i<products.length; i++) {
-					var product = products[i];
-					if (product.product_key == key) {
-						var model = ko.dataFor(this);
-                        if (model.expense_public_id()) {
-                            return;
-                        }
-                        if (product.notes) {
-                            model.notes(product.notes);
-                        }
-                        if (product.cost) {
-                            model.cost(accounting.toFixed(product.cost, 2));
-                        }
-                        if (!model.qty()) {
-						  model.qty(1);
-                        }
-                        @if ($account->invoice_item_taxes)
-                            if (product.default_tax_rate) {
-                                model.tax(self.model.getTaxRateById(product.default_tax_rate.public_id));
-                            }
-                        @endif
-                        model.product_key(key);
-                        onItemChange();
-                        break;
-					}
-				}
-			});
-		@endif
 	}
 
 	function createInvoiceModel() {
diff --git a/resources/views/invoices/knockout.blade.php b/resources/views/invoices/knockout.blade.php
index adeb7759915a..3798cb458131 100644
--- a/resources/views/invoices/knockout.blade.php
+++ b/resources/views/invoices/knockout.blade.php
@@ -9,7 +9,7 @@ function ViewModel(data) {
     self.expense_currency_id = ko.observable();
     self.tax_rates = ko.observableArray();
     self.tax_rates.push(new TaxRateModel());  // add blank row
-
+    self.products = {!! $products !!};
 
     self.loadClient = function(client) {
         ko.mapping.fromJS(client, model.invoice().client().mapping, model.invoice().client);
@@ -807,4 +807,56 @@ function ItemModel(data) {
     this.onSelect = function() {}
 }
 
-</script>
+/* Custom binding for product key typeahead */
+ko.bindingHandlers.typeahead = {
+    init: function (element, valueAccessor, allBindingsAccessor, viewModel, bindingContext) {
+        var $element = $(element);
+        var allBindings = allBindingsAccessor();
+        
+        $element.typeahead({
+            highlight: true,
+            minLength: 0,
+        },
+        {
+            name: 'data',
+            display: allBindings.key,
+            source: searchData(allBindings.items, allBindings.key)
+        }).on('typeahead:select', function(element, datum, name) {
+            @if (Auth::user()->account->fill_products)
+                var model = ko.dataFor(this);
+                if (model.expense_public_id()) {
+                    return;
+                }
+                if (datum.notes) {
+                    model.notes(datum.notes);
+                }
+                if (datum.cost) {
+                    model.cost(accounting.toFixed(datum.cost, 2));
+                }
+                if (!model.qty()) {
+                    model.qty(1);
+                }
+                @if ($account->invoice_item_taxes)
+                    if (datum.default_tax_rate) {
+                        model.tax(self.model.getTaxRateById(datum.default_tax_rate.public_id));
+                    }
+                @endif
+            @endif
+            onItemChange();
+        }).on('typeahead:change', function(element, datum, name) {
+            var value = valueAccessor();
+            value(datum);
+            onItemChange();
+            refreshPDF(true);
+        });
+    },
+
+    update: function (element, valueAccessor) {
+        var value = ko.utils.unwrapObservable(valueAccessor());
+        if (value) {
+            $(element).typeahead('val', value);
+        }
+    }
+};
+
+</script>
\ No newline at end of file
diff --git a/tests/acceptance/CheckBalanceCest.php b/tests/acceptance/CheckBalanceCest.php
index 0ffe27f62a4f..33378baab0ba 100644
--- a/tests/acceptance/CheckBalanceCest.php
+++ b/tests/acceptance/CheckBalanceCest.php
@@ -44,6 +44,7 @@ class CheckBalanceCest
         $I->amOnPage('/invoices/create');
         $I->selectDropdown($I, $clientEmail, '.client_select .dropdown-toggle');
         $I->fillField('table.invoice-table tbody tr:nth-child(1) #product_key', $productKey);
+        $I->click('table.invoice-table tbody tr:nth-child(1) .tt-selectable');
         $I->click('Save');
         $I->wait(1);
         $I->see($clientEmail);
diff --git a/tests/acceptance/OnlinePaymentCest.php b/tests/acceptance/OnlinePaymentCest.php
index ad4b15517579..37091ce2953b 100644
--- a/tests/acceptance/OnlinePaymentCest.php
+++ b/tests/acceptance/OnlinePaymentCest.php
@@ -53,6 +53,7 @@ class OnlinePaymentCest
         $I->amOnPage('/invoices/create');
         $I->selectDropdown($I, $clientEmail, '.client_select .dropdown-toggle');
         $I->fillField('table.invoice-table tbody tr:nth-child(1) #product_key', $productKey);
+        $I->click('table.invoice-table tbody tr:nth-child(1) .tt-selectable');
         $I->click('Save');
         $I->see($clientEmail);
 
@@ -88,6 +89,7 @@ class OnlinePaymentCest
         // create recurring invoice and auto-bill
         $I->amOnPage('/recurring_invoices/create');
         $I->selectDropdown($I, $clientEmail, '.client_select .dropdown-toggle');
+        $I->click('table.invoice-table tbody tr:nth-child(1) .tt-selectable');
         $I->fillField('table.invoice-table tbody tr:nth-child(1) #product_key', $productKey);
         $I->checkOption('#auto_bill');
         $I->executeJS('preparePdfData(\'email\')');
diff --git a/tests/acceptance/PaymentCest.php b/tests/acceptance/PaymentCest.php
index 6275babbbec6..3940d6c7ae15 100644
--- a/tests/acceptance/PaymentCest.php
+++ b/tests/acceptance/PaymentCest.php
@@ -40,6 +40,7 @@ class PaymentCest
         $I->amOnPage('/invoices/create');
         $I->selectDropdown($I, $clientEmail, '.client_select .dropdown-toggle');
         $I->fillField('table.invoice-table tbody tr:nth-child(1) #product_key', $productKey);
+        $I->click('table.invoice-table tbody tr:nth-child(1) .tt-selectable');
         $I->click('Save');
         $I->see($clientEmail);
 
diff --git a/tests/acceptance/TaxRatesCest.php b/tests/acceptance/TaxRatesCest.php
index 06ec37575746..209634de6fed 100644
--- a/tests/acceptance/TaxRatesCest.php
+++ b/tests/acceptance/TaxRatesCest.php
@@ -68,6 +68,7 @@ class TaxRatesCest
         $I->amOnPage('/invoices/create');
         $I->selectDropdown($I, $clientEmail, '.client_select .dropdown-toggle');
         $I->fillField('table.invoice-table tbody tr:nth-child(1) #product_key', $productKey);
+        $I->click('table.invoice-table tbody tr:nth-child(1) .tt-selectable');
         $I->selectOption('#taxRateSelect', $invoiceTaxName . ' ' . $invoiceTaxRate . '%');
         $I->wait(2);