Expanded the ways of finding propertyurls more accurate