Fixed so company is supported also in new group sql queries.