Improved handling of bookingID changes during save fixes #14