diff --git a/composer.json b/composer.json
index 6efbb59..aae5345 100644
--- a/composer.json
+++ b/composer.json
@@ -2,7 +2,7 @@
     "name": "hotspotbilling/phpnuxbill",
     "type": "template",
     "description": "PHPNuxBill a Hotspot Billing Software.",
-    "keywords": ["template"],
+    "keywords": ["template","PHPMixBill","PHPnuxBill","Mikrotik","Hotspot","Billing"],
     "homepage": "https://github.com/hotspotbilling/phpnuxbill",
     "license": "MIT",
     "authors": [
diff --git a/system/controllers/prepaid.php b/system/controllers/prepaid.php
index 4aa267a..3368f75 100644
--- a/system/controllers/prepaid.php
+++ b/system/controllers/prepaid.php
@@ -367,7 +367,7 @@ switch ($action) {
             $paginator = Paginator::bootstrap('tbl_voucher', 'code', '%' . $code . '%');
             $d = ORM::for_table('tbl_plans')->where('enabled', '1')
                 ->join('tbl_voucher', array('tbl_plans.id', '=', 'tbl_voucher.id_plan'))
-                ->where_like('tbl_plans.code', '%' . $code . '%')
+                ->where_like('tbl_voucher.code', '%' . $code . '%')
                 ->offset($paginator['startpoint'])
                 ->limit($paginator['limit'])
                 ->find_many();
@@ -380,6 +380,7 @@ switch ($action) {
         }
 
         $ui->assign('d', $d);
+        $ui->assign('_code', $code);
         $ui->assign('paginator', $paginator);
         run_hook('view_list_voucher'); #HOOK
         $ui->display('voucher.tpl');
diff --git a/ui/ui/voucher.tpl b/ui/ui/voucher.tpl
index a867845..c1b9168 100644
--- a/ui/ui/voucher.tpl
+++ b/ui/ui/voucher.tpl
@@ -13,7 +13,7 @@
                                     <span class="fa fa-search"></span>
                                 </div>
                                 <input type="text" name="code" class="form-control"
-                                    placeholder="{$_L['Search_by_Code']}...">
+                                    placeholder="{$_L['Search_by_Code']}..." value="{$_code}">
                                 <div class="input-group-btn">
                                     <button class="btn btn-success">{$_L['Search']}</button>
                                 </div>