[INTEGRATION] Improved environment matching in xml-imported strings