Booking search fixes