Would it be possible to control access permission based on OG membership ? This would fix the problem of OG content visibility being only available to node entities.