Big bug. The param entity finder is returning only either the primary or the related entities - I need both.