better handling of data for rankings