[TM-36] - Add grouping parameter to rest, service and dao, add grouping fields to search page, fix tests