Quick hack to not escape + or : required by some APIs