Updated grid with 2 comboboxes