Fix issue with too many waves in the URL