Replace road name check with road locality check
Cater for null road type
Remove redundant code