added comboboxes and new query