MYC-33 - make companyId optional, sort not only predefined fields