Added some pollyfills for empty data sets.