Add decodeURI for Safari
Remove debug settings