Improved handling of empty data sets; changed to series data processing