Sorting fix, field event test update