Add / at the end of $current-url
Added space before and after html comment