Added Anastasia's changes for group search