Fixed some bugs for Geomatching service.