Grouping is messed up when calling un-grouped query using same tables as previous query

This only happens when calling a grouped query, then after that calling an ungrouped query that uses tables that were in the grouped query. The result being the ungrouped query results are returned grouped because the group data is not flushed out.

Grouped query results is a new feature so this isn't affecting much yet.