* [PM-1191] fix: use join instead of select-subquery
EF6 is currently not able to translate LINQ that include selects after groupby statements. Using join let's us bypass this issue.
* [PM-1191] chore: simplify queries
* Revert "[PM-1191] chore: simplify queries"
This reverts commit f57443d8c4.