Cleaning up hot matches and sort