Make setting a company and getting a list of sites for a company use canonical_company [PD-886]

All tests pass
buids isn't a values list. That or drop `__id` from the query.