Remove duplicate public group query