fix greedy search in get_id_string_from_xml_str
Merge remote-tracking branch 'origin/eHealth_production' into eHealth_production