[Data] Integrated the latest updates from ORI (RFD and Geonames).
[Dev] Improved the algorithm for issue #3. It could be almost closed.