diff --git a/application/language/Chinese(Simplified)/translations_lang.php b/application/language/Chinese(Simplified)/translations_lang.php
index 8c8d9367..14dce497 100755
--- a/application/language/Chinese(Simplified)/translations_lang.php
+++ b/application/language/Chinese(Simplified)/translations_lang.php
@@ -3,7 +3,7 @@
 $lang['page_title'] = '准备预约';
 $lang['service_and_provider'] = '选择中医师以及服务项目';
 $lang['select_service'] = '选择您需要的服务项目';
-$lang['select_provider'] = '选择服务人员';
+$lang['select_provider'] = '选择中医师';
 $lang['duration'] = '时长';
 $lang['minutes'] = '分钟';
 $lang['price'] = '价格';
@@ -273,7 +273,7 @@ $lang['ea_update_success'] = '预约系统已成功更新.';
 $lang['require_captcha'] = '需要验证码';
 $lang['require_captcha_hint'] = '启用后，客户在预定/更新预约前必须输入随机生成的验证码字符串.';
 $lang['captcha_is_wrong'] = '验证码验证失败，请重试.';
-$lang['any_provider'] = '任何服务人员';
+$lang['any_provider'] = '任一中医师皆可';
 $lang['requested_hour_is_unavailable'] = '所请求的预约时间不可用。请选择其他时间段预约.';
 $lang['customer_notifications'] = '客户通知';
 $lang['customer_notifications_hint'] = '定义客户在其预约日程更改时是否会收到电子邮件通知。';
@@ -491,7 +491,8 @@ $lang['home_price_button'] = '价格表';
 $lang['home_teams_button'] = '医师简介';
 $lang['home_directions_button'] = '预约说明';
 $lang['home_contact_button'] = '联系我们';
-$lang['please_select_service'] = '请选择(必选)';
+$lang['please_select_service'] = '请选择(默认：其它)';
+$lang['please_select_provider'] = '请选择(必选)';
 $lang['search_appointments_title'] = '预约查询';
 $lang['enter_phone_number'] = '输入预约时提交的电话号码';
 $lang['search_button'] = '查询';
diff --git a/application/language/Chinese(Traditional)/translations_lang.php b/application/language/Chinese(Traditional)/translations_lang.php
index 420541b8..cba694d5 100755
--- a/application/language/Chinese(Traditional)/translations_lang.php
+++ b/application/language/Chinese(Traditional)/translations_lang.php
@@ -3,7 +3,7 @@
 $lang['page_title'] = '準備預約';
 $lang['service_and_provider'] = '選擇中醫師以及服務項目';
 $lang['select_service'] = '選擇您需要的服務項目';
-$lang['select_provider'] = '選擇服務人員';
+$lang['select_provider'] = '選擇中醫師';
 $lang['duration'] = '長度';
 $lang['minutes'] = '分鐘';
 $lang['price'] = '價格';
@@ -273,7 +273,7 @@ $lang['ea_update_success'] = '預約系統已成功更新.';
 $lang['require_captcha'] = '需要驗證碼';
 $lang['require_captcha_hint'] = '啟用後，客戶在預定/更新預約前必須輸入隨機產生的驗證碼字串.';
 $lang['captcha_is_wrong'] = '驗證碼驗證失敗，請重試.';
-$lang['any_provider'] = '任何服務人員';
+$lang['any_provider'] = '任一中醫師皆可';
 $lang['requested_hour_is_unavailable'] = '所要求的預約時間不可用。請選擇其他時段預約.';
 $lang['customer_notifications'] = '客戶通知';
 $lang['customer_notifications_hint'] = '定義客戶在其預約行程變更時是否會收到電子郵件通知。 ';
@@ -491,7 +491,8 @@ $lang['home_price_button'] = '價格表';
 $lang['home_teams_button'] = '醫師簡介';
 $lang['home_directions_button'] = '預約說明';
 $lang['home_contact_button'] = '聯絡我們';
-$lang['please_select_service'] = '請選擇(必填)';
+$lang['please_select_service'] = '請選擇(預設：其它)';
+$lang['please_select_provider'] = '請選擇(必填)';
 $lang['search_appointments_title'] = '預約查詢';
 $lang['enter_phone_number'] = '輸入預約時提交的電話號碼';
 $lang['search_button'] = '查詢';
diff --git a/application/language/English/translations_lang.php b/application/language/English/translations_lang.php
index 32986f9b..c624d1c7 100755
--- a/application/language/English/translations_lang.php
+++ b/application/language/English/translations_lang.php
@@ -491,7 +491,8 @@ $lang['home_price_button'] = 'Price List';
 $lang['home_teams_button'] = 'Our Teams';
 $lang['home_directions_button'] = 'Directions';
 $lang['home_contact_button'] = 'Contact Us';
-$lang['please_select_service'] = 'Please Select(*)';
+$lang['please_select_service'] = 'Please select(Default: Other)';
+$lang['please_select_provider'] = 'Please select(*)';
 $lang['search_appointments_title'] = 'Enquiry';
 $lang['enter_phone_number'] = 'Enter Phone Number';
 $lang['search_button'] = 'Search';
diff --git a/application/views/components/booking_type_step.php b/application/views/components/booking_type_step.php
index aae6898e..5539b07d 100755
--- a/application/views/components/booking_type_step.php
+++ b/application/views/components/booking_type_step.php
@@ -19,7 +19,7 @@
 
                     <select id="select-service" class="form-select">
                         <option value="22">
-                            <?= lang('please_select') ?> (預設：其它)
+                            <?= lang('please_select_service') ?> 
                         </option>
                         <?php
                         // Group services by category, only if there is at least one service with a parent category.
@@ -87,7 +87,7 @@
 
                     <select id="select-provider" class="form-select">
                         <option value="">
-                            <?= lang('please_select_service') ?>
+                            <?= lang('please_select_provider') ?>
                         </option>
                     </select>
                 </div>
diff --git a/assets/img/whatsapp-qr-code.png b/assets/img/whatsapp-qr-code.png
index ed3ac7e0..45d03b04 100644
Binary files a/assets/img/whatsapp-qr-code.png and b/assets/img/whatsapp-qr-code.png differ
diff --git a/assets/js/pages/booking.js b/assets/js/pages/booking.js
index ad72970b..ce1f38a0 100755
--- a/assets/js/pages/booking.js
+++ b/assets/js/pages/booking.js
@@ -358,7 +358,7 @@ App.Pages.Booking = (function () {
 
             $selectProvider.empty();
 
-            $selectProvider.append(new Option(lang('please_select_service'), ''));
+            $selectProvider.append(new Option(lang('any_provider'), 'any-provider'));
 
             const isChinese = (text) => /[\u4e00-\u9fa5]/.test(text);
 
diff --git a/assets/js/utils/calendar_default_view.js b/assets/js/utils/calendar_default_view.js
index eb9d4004..09a5c6d3 100755
--- a/assets/js/utils/calendar_default_view.js
+++ b/assets/js/utils/calendar_default_view.js
@@ -618,14 +618,14 @@ App.Utils.CalendarDefaultView = (function () {
                     }),
                     $('<br/>'),
 
-                    $('<strong/>', {
-                        'class': 'd-inline-block me-2',
-                        'text': lang('timezone'),
-                    }),
-                    $('<span/>', {
-                        'text': vars('timezones')[info.event.extendedProps.data.provider.timezone],
-                    }),
-                    $('<br/>'),
+                    // $('<strong/>', {
+                    //     'class': 'd-inline-block me-2',
+                    //     'text': lang('timezone'),
+                    // }),
+                    // $('<span/>', {
+                    //     'text': vars('timezones')[info.event.extendedProps.data.provider.timezone],
+                    // }),
+                    // $('<br/>'),
 
                     $('<strong/>', {
                         'class': 'd-inline-block me-2',
@@ -650,11 +650,18 @@ App.Utils.CalendarDefaultView = (function () {
                         'text': lang('provider'),
                     }),
                     App.Utils.CalendarEventPopover.renderMapIcon(info.event.extendedProps.data.provider),
+                    provider = info.event.extendedProps.data.provider,
+                    isChineseName = /[\u4e00-\u9fa5]/.test(provider.last_name) || /[\u4e00-\u9fa5]/.test(provider.first_name),           
+                    
                     $('<span/>', {
-                        'text':
-                            info.event.extendedProps.data.provider.first_name +
-                            ' ' +
-                            info.event.extendedProps.data.provider.last_name,
+                        'text': (function() {
+                            if (isChineseName) {
+                                return provider.last_name + provider.first_name;
+                            } else {
+                                return provider.first_name + ' ' + provider.last_name;
+                            }
+                        }),
+                            
                     }),
                     $('<br/>'),