Fix 'between' condition #596
Fix 'Dealer Tel number' #601