Added decodeURIComponent to the url components