Fixed url question mark bug