diff --git a/webapp/controller/MarketController.class.php b/webapp/controller/MarketController.class.php
index 2fd7bf24..a5b689fa 100644
--- a/webapp/controller/MarketController.class.php
+++ b/webapp/controller/MarketController.class.php
@@ -84,6 +84,15 @@ class MarketController extends BaseAuthedController {
                             'custom_func' => function () use ($queryData) {
                                 $searchFilter = $queryData['search_filters'];
                                 $arrSearchFilter = explode('|', $searchFilters);
+                                if (count($arrSearchFilter) <= 0) {
+                                    return ' AND 1=1 ';
+                                } else if (count($arrSearchFilter) == 1) {
+                                    return ' AND c_name=\"' . $arrSearchFilter[0] . '\"';
+                                } else if (count($arrSearchFilter) == 2) {
+                                    return ' AND (c_name=\"'
+                                        . $arrSearchFilter[0] . '\" OR ' .
+                                        'token_id=\"' . $arrSearchFilter[1] . '\")';
+                                }
                             }
                         ),
                         array(
@@ -110,8 +119,11 @@ class MarketController extends BaseAuthedController {
                             'cond' => 'custom',
                             'ignore_empty' => true,
                             'custom_func' => function () use ($queryData) {
-                                $searchFilter = $queryData['search_filters'];
+                                $searchFilter = $queryData['price_filters'];
                                 $arrSearchFilter = explode('|', $searchFilters);
+                                return ' AND (price>=\"'
+                                    . $arrSearchFilter[0] . '\" AND ' .
+                                    'price<=\"' . $arrSearchFilter[1] . '\")';
                             }
                         ),
                         array(
@@ -120,8 +132,11 @@ class MarketController extends BaseAuthedController {
                             'cond' => 'custom',
                             'ignore_empty' => true,
                             'custom_func' => function () use ($queryData) {
-                                $searchFilter = $queryData['search_filters'];
+                                $searchFilter = $queryData['amount_filters'];
                                 $arrSearchFilter = explode('|', $searchFilters);
+                                return ' AND (amount>=\"'
+                                    . $arrSearchFilter[0] . '\" AND ' .
+                                    'amount<=\"' . $arrSearchFilter[1] . '\")';
                             }
                         )
                     )