First attempt to improve perfs
Now first looking in the gazetteer and the in matched names