diff --git a/generator/search_index_builder.cpp b/generator/search_index_builder.cpp
index c44bfa2718..83ccde2e45 100644
--- a/generator/search_index_builder.cpp
+++ b/generator/search_index_builder.cpp
@@ -290,6 +290,13 @@ public:
     if (types.Empty())
       return;
 
+    if (ftypes::IsAirportChecker::Instance()(types))
+    {
+      string const iata = f.GetMetadata().Get(feature::Metadata::FMD_AIRPORT_IATA);
+      if (!iata.empty())
+        inserter(StringUtf8Multilang::kDefaultCode, iata);
+    }
+
     Classificator const & c = classif();
 
     vector<uint32_t> categoryTypes;