Added building and resource field loading although comboBox becomes slow