Fixing location-spot matching bugs