Fixed sort issue - more tests - error in field return