Added group search to search factory