fix group search + tests