Add missing choices + default options at the table