fixed #419 and bug with booking dates calendar