Fix company and work sort issue