fixed entities relations