Better fix of nice URL parsing edge cases