WIP: Add concept-identifier
Get concept identifiers to work in group clauses