Improving url parser