Updates for Gazetter detection