OGM-562

@DavideD That's a quick one for fixing the issue uncovered by @emmanuelbernard during the meeting. It also fixes some other related minor glitches as well.
Shouldn't we keep a test to check that in this situation an array of object is returned? I remember that in past this was not the case.