Improved url parse logic.