Booking bugfixes 4 2