Improvement in UrlExtractor