NEXT-1141 - Improve Format Assignment