handle grouping when no results
Merge pull request #624 from demaagdk/develop

handle grouping when no results