improved Y geo matching