loading of data fixed, improved handling of empty data tables