Feature/booking 1.0.4b fix