diff --git a/Apiv1.php b/Apiv1.php
index 60596c6..5ed89c5 100644
--- a/Apiv1.php
+++ b/Apiv1.php
@@ -59,7 +59,7 @@ class Apiv1{
         );
         
         $sql = "SELECT * FROM $this->job_table WHERE start>='%s' and start <='%s' order by start ASC ,staff ASC";
-        //$sql = "SELECT * FROM $this->job_table order by start ASC ,staff ASC";
+        $sql = "SELECT * FROM $this->job_table order by start ASC ,staff ASC";
         $query = $wpdb->prepare ($sql, array($start, $finish));
         $response['sql'] = $query;
         $jobs = $wpdb->get_results($query);
diff --git a/html/jobv1.html b/html/jobv1.html
index b63b6c5..b22caa4 100644
--- a/html/jobv1.html
+++ b/html/jobv1.html
@@ -9,7 +9,7 @@
             </div>
             <div class="divTableCell bstart {{#start_err}} error {{/start_err}}">{{start}}</div>
             <div class="divTableCell bfinish {{#finish_err}} error {{/finish_err}}">{{finish}}</div>
-            <div class="divTableCell brate {{#rate_err}} error {{/rate_err}}"  {{#non_hour}} title="{{rate_err}}" {{/non_hour}} >{{rate_name}}</div>
+            <div class="divTableCell brate {{#rate_err}} error {{/rate_err}}"  {{#rate_err}} title="{{rate_err}}" {{/rate_err}} >{{rate_name}}</div>
             <div class="divTableCell bstaff {{#staff_err}} error {{/staff_err}}" title="{{staff_err}}">{{staff_name}}</div>
             <div class="divTableCell bclient {{#client_err}} error {{/client_err}} {{#is_week1}}week1color{{/is_week1}} {{#is_week2}}week2color{{/is_week2}}">{{client_name}}</div>
             <div class="divTableCell bconfirmed"><input name="ack" type=checkbox {{#is_confirmed}}checked{{/is_confirmed}} onclick="return false;"></div>
diff --git a/js/bts_office.js b/js/bts_office.js
index ff69cb6..a46e464 100644
--- a/js/bts_office.js
+++ b/js/bts_office.js
@@ -287,7 +287,7 @@
 			el.addClass('Editing');
 			 
 			var newjob_id = el.attr('data-newjob_id');
-			if (newjob_id != ''){
+			if (typeof newjob_id != 'undefined' && newjob_id != ''){
 				do_edit_new_job(newjob_id);
 			}else{
 				var id = el.attr('data-id');
@@ -319,6 +319,8 @@
 			var job  = data.job;
 			//console.log('close_editor event %o, %o', editor, job);
 			
+			editor.off_event_handler();//remove all events handler;
+			
 			var templ = $("#jobv1_item").html();
 			var html = Mustache.render(templ, {jobs:job}); //job id should be available;
 			if ( $('div.jobTable.Editing').length == 0){
@@ -390,7 +392,7 @@
 				job.is_new = true;
 				title = "Create New Job ";
 			}else if (job instanceof Job){
-				tile = "Create new Job by Copy Existing one";
+				title = "Create new Job by Copy Existing one";
 			}
  		    
 		    job.editorid = Math.floor(Math.random() * Math.floor(99999)); // a random number;
@@ -543,7 +545,6 @@
 				if (typeof bts().earnings_rate[e.rate] != 'undefined') {
 					e.rate_name = bts().earnings_rate[e.rate].RatePerUnit  + "-" + bts().earnings_rate[e.rate].Name;
 					if (! has_txt_hour( bts().earnings_rate[e.rate].TypeOfUnits )){
-						e.rate_non_hour = true;	
 						e.rate_err = `Rate unit must be ⟦ Hours ⟧
 								Possible solution:
 								1. Change it in Xero
@@ -737,57 +738,14 @@
 			
 			off_event_handler(){
 				this.el.off('change',"div.btos select");
-				//TODO
-				this.el.find("div.bstart input").change(function(){
-					if (self.validate_start()){
-						self.data.start = self.get_start();
-						self.set_err_msg_start('');
-						self.validate_start_and_finish();
-					}
-				});
-				this.el.find("div.bfinish input").change(function(){
-					if (self.validate_finish()){
-						self.data.finish = self.get_finish();
-						self.set_err_msg_finish('');
-						self.validate_start_and_finish();
-					}
-				});
-				this.el.find("div.bstaff select").change(function(){
-					if (self.validate_staff()){
-						self.data.staff = self.get_staff();
-						self.set_err_msg_staff('');
-					}
-				});
-				this.el.find("div.bclient select").change(function(){
-					if (self.validate_client()){
-						self.data.client = self.get_client();
-						self.set_err_msg_client('');
-					}
-				});
-				
-				this.el.find("div.brate select").change(function(){
-					if (self.validate_rate()){
-						self.data.rate = self.get_rate();
-						self.set_err_msg_rate('');
-					}
-				});
-				this.el.find("div.bconfirmed input").change(function(){
-					if(self.validate_ack()){
-						self.data.ack = self.get_ack();
-					}
-				});
-				this.el.find("div.brating select").change(function(){
-					if( self.validate_rating()){
-						self.data.rating =self.get_rating();
-					}
-				});
-				this.el.find("div.bsave span.ticon-save").click(function(e){
-					if ( self.validate() ){
-						self.do_save_record();
-					}else{
-						self.set_err_msg_save('Data Error');
-					}
-				});				
+				this.el.off('change',"div.bstart input");
+				this.el.off('change',"div.bfinish input");
+				this.el.off('change',"div.bstaff select");
+				this.el.off('change',"div.bclient select");
+				this.el.off('change',"div.brate select");
+				this.el.off('change',"div.bconfirmed input");
+				this.el.off('change',"div.brating select");
+				this.el.off('change',"div.bsave span.ticon-save");				
 			}
 
 			get_job_id(){
@@ -1695,6 +1653,10 @@
 
 		
 		function has_txt_hour(str){
+			if (str == null){
+				console.warn('null');
+				return;
+			}
 			var s = str.toLowerCase();
 			return s.indexOf('hour') != -1;
 		}
@@ -1750,7 +1712,20 @@
 			$('div.bts_message_button').trigger('click');
 		});
 		
+		function check_workspace_error(){
+			var els = $('div.workspace').find('.error');
+			if(els.length >0){
+				els.get(0).scrollIntoView();
+				return true;
+			}
+			return false;
+		}
+		
 		$('button[name="confirmschedule"]').click(function(){//TODO: check error before confirm
+			if( check_workspace_error() ){
+				return;
+			}
+			
 			if (!confirm('sending email to each staff for their job arrangement?'))
 				return;
 			$('div.bts_message .ult-overlay-close-inside').hide();
@@ -1879,7 +1854,7 @@
 
 		}
 		
-		var debounced_calculate = debounce(calculate_total_hour_and_money, 500);
+		var debounced_calculate = debounce(calculate_total_hour_and_money, 2000);
 		
 		function calculate_total_hour_and_money()
 		{
@@ -1893,9 +1868,7 @@
 				people.reset_summary();
 			});
 			
-			$('div.workspace > .divTable.jobTable').each(function(i,e){
-				if (! $(e).is(':visible'))
-					return;
+			$('div.workspace > .divTable.jobTable:visible').each(function(i,e){
 				
 				var id = $(e).attr('data-id');
 				var job = bts().job_map[id];
diff --git a/ts.php b/ts.php
index c3bc7f6..b74c56f 100644
--- a/ts.php
+++ b/ts.php
@@ -631,7 +631,10 @@ class AcareOffice{
         foreach($options as $o){
             if ($o['CurrentRecord'] !='true')
                 continue;
-                
+            if ($o['RateType'] != 'RATEPERUNIT')
+                continue;
+            if (stripos($o['TypeOfUnits'],'hour') != false) //unit contains hour Hour 
+                continue;
             $result.=sprintf("<option value='%s'> $%3.2f-%s</option>",
                     $o['EarningsRateID'], $o['RatePerUnit'], $o['Name']);
         }