Ics fixes

Fixes metadata parsing to avoid clashes of key/value strings.

NB: depends on the N-D branch being merged first