Little Bugfix ... Ampersands should be encoded