With https://hibernate.atlassian.net/browse/HHH-16396 the resolution of {{TableGroup}}s inside subqueries was changed to correctly handle cases where the same alias was used in both the parent query and the internal one.

This issue follows up on that work by improving the logic and handling some edge cases.