diff --git a/apps/mappingmanagement/web/src/main/resources/app/view/mapping/mapping.html b/apps/mappingmanagement/web/src/main/resources/app/view/mapping/mapping.html
index 0572210..0c35dde 100644
--- a/apps/mappingmanagement/web/src/main/resources/app/view/mapping/mapping.html
+++ b/apps/mappingmanagement/web/src/main/resources/app/view/mapping/mapping.html
@@ -33,7 +33,20 @@
             <div class="active"
                  icon icon-id="deviceTable" icon-size="42"
                  tooltip tt-msg="deviceTip"
-                 ng-click="nav('device')"></div>
+                 ng-click="nav('device')">
+            </div>
+        </div>
+
+        <div class="search">
+            <input type="text" ng-model="queryTxt" placeholder="Search"/>
+            <select ng-model="queryBy">
+                <option value="" disabled>Search By</option>
+                <option value="$">All Fields</option>
+                <option value="id">Mapping ID</option>
+                <option value="state">State</option>
+                <option value="type">Store Type</option>
+                <option value="mappingKey">Mapping Key</option>
+            </select>
         </div>
     </div>
 
diff --git a/apps/mappingmanagement/web/src/main/resources/app/view/mapping/mapping.js b/apps/mappingmanagement/web/src/main/resources/app/view/mapping/mapping.js
index bae6b89..c3892d4 100644
--- a/apps/mappingmanagement/web/src/main/resources/app/view/mapping/mapping.js
+++ b/apps/mappingmanagement/web/src/main/resources/app/view/mapping/mapping.js
@@ -220,6 +220,10 @@
             ks = _ks_;
             is = _is_;
             wss = _wss_;
+            $scope.deviceTip = 'Show device table';
+            $scope.briefTip = 'Switch to brief view';
+            $scope.detailTip = 'Switch to detailed view';
+            $scope.brief = true;
 
             params = $location.search();
             if (params.hasOwnProperty('devId')) {
@@ -250,6 +254,18 @@
                  wss.unbindHandlers(handlers);
              });
 
+             $scope.briefToggle = function () {
+                 $scope.brief = !$scope.brief;
+             };
+
+             Object.defineProperty($scope, "queryFilter", {
+                get: function() {
+                    var out = {};
+                    out[$scope.queryBy || "$"] = $scope.queryTxt;
+                    return out;
+                }
+             });
+
             $log.log('OvMappingCtrl has been created');
         }])