UPGRADE. Added combobox database list