refactor findSuggestionsForGroup

a total clean up