Fix URL parsing, resolve #25