LPS-39087 add companyId as part fo query