Set address search to use a better query but still not sure if it works.