Fix search with groups