Update service form scheduler + fix issue with Booking