improved the handling for georef by code