Fix/idXMLrefs

As suggested I will fiddle out commits to feature/MZID into single pull request branches