Fixed entity fetching. TODO add company to employee in JSON (output).