Fixes #65 - Adding a groupBy for searching.