More booking type tweaks