Added Sri Lanka query and improved addr_import