fixed groupings of results 2.0