Improved sorting algorithm
Added more data for testing
Removed unique_id temporarily