fix data ordered, updated analytics