Changed search return
Added group collection stuffs