[FEATURE] finish single query fetching of non MM relations

Change-Id: I8f00c5b7a787cea25e77bf65efdbb32833468fc7