URL redirection fix (prevent "-" from ruining everything)