[1243] Fixes group_search and removes one copy of the function (from a bad merge?)