LRDOCS-523 Added finders by groupId and rebuilt services