Better URL parsing for upcoming 1.1.7 build