Replace inserttags in order prefix when generating unique ID (fixes #510)
Company and name was on same line in textual address representation (#127)