fixes issue #363
by escaping '+' characters before Unescaping the whole path