OG7 and Entity reference - Part 2