[OEM-214] Fixed saving booking sort order when bookings have duplicate display_order
[OEM-214] Fixed setting of initial display_order when booking is created