XML system symbols replaces

Even more quote fixes, added some escape for & and build-in quotes for
extended parameters