Ensure LMS passes correct group_id when querying content

TNL-23
ditto for next 2