EmptyDataTable handled better than before