diff --git a/app/assets/javascripts/channels/order_reservation.js b/app/assets/javascripts/channels/order_reservation.js
index 32265e38..1c6c777d 100644
--- a/app/assets/javascripts/channels/order_reservation.js
+++ b/app/assets/javascripts/channels/order_reservation.js
@@ -8,7 +8,7 @@ App.order_reservation = App.cable.subscriptions.create('OrderReservationChannel'
     var order  = data.data;
     if(order.length > 0){
       $('.custom-table.'+shop_code+'_order_reserve_cable tbody').html("");
-      $(".nav-item ."+shop_code+" .red > a > p.num").text(order.length);
+      $("."+shop_code+" > .nav-item.red > a > p.num").text(order.length);
       $.each(order, function(key,value){
         var active_class = "";
         if(key==0){
diff --git a/app/assets/javascripts/order_reservation.js b/app/assets/javascripts/order_reservation.js
index 3f5a0ddf..6931e68f 100644
--- a/app/assets/javascripts/order_reservation.js
+++ b/app/assets/javascripts/order_reservation.js
@@ -147,6 +147,8 @@ $(function() {
         return false;
     }
   });
+
+  $('button[data-dismiss="modal"]').on('click', function(){ $(this).parent().parent().parent().parent().modal('hide'); });
 });
 
 function check_emp_access_code(access_code,type) {
diff --git a/app/controllers/concerns/token_verification.rb b/app/controllers/concerns/token_verification.rb
index b49ef597..45bcd3e2 100755
--- a/app/controllers/concerns/token_verification.rb
+++ b/app/controllers/concerns/token_verification.rb
@@ -18,7 +18,7 @@ module TokenVerification
       # Rails.logger.debug "token - " + token.to_s
       if(options.length !=0 && options["from"] == "DOEMAL")
         if(ENV["SERVER_MODE"] === "cloud")
-          from = "local" #request.subdomain.downcase  + "." + request.domain.downcase            
+          from = request.subdomain.downcase  + "." + request.domain.downcase #"local"        
           aes = MyAesCrypt.new
           return aes.checkKeyForAuth(from, token)  
         end
diff --git a/app/views/origami/order_reservation/index.html.erb b/app/views/origami/order_reservation/index.html.erb
index 6bd8344b..4fcbeffa 100644
--- a/app/views/origami/order_reservation/index.html.erb
+++ b/app/views/origami/order_reservation/index.html.erb
@@ -30,8 +30,8 @@
   <!-- end count function -->
   <div class="row m-t--10">
     <div class="col-lg-5 col-md-5 col-sm-5 div_order_margin">
-      <ul class="nav nav-tabs tab-col-teal" role="tablist">
-        <li class="nav-item <%= @shop.shop_code %> red m-b-5" data-color="#F44336" data-type="pending">
+      <ul class="nav nav-tabs tab-col-teal <%= @shop.shop_code %>" role="tablist">
+        <li class="nav-item red m-b-5" data-color="#F44336" data-type="pending">
           <a class="nav-link" data-toggle="tab" href="#pending" role="tab">
             <p class="num p-t-5">
               <%= pending_count %>
@@ -579,7 +579,7 @@
       </div>
       <div class="modal-body doemal_new_orderBody">
         <div class="form-group text-center">
-          You have new order  <b><span id="new_order"></span></b> at <b><span id="new_order_date"></span></b>
+          You have new order  <b><span id="new_order"></span></b> requested for <b><span id="new_order_date"></span></b>
         </div>
       </div>
       <div class="modal-footer ">