diff --git a/generator/osm_element.hpp b/generator/osm_element.hpp
index 4ed82bc531..9b34f3285b 100644
--- a/generator/osm_element.hpp
+++ b/generator/osm_element.hpp
@@ -262,8 +262,7 @@ class SecondPassParser : public BaseOSMParser
   unique_ptr<FileWriter> m_addrWriter;
   bool NeedWriteAddress(FeatureParams const & params) const
   {
-    static ftypes::IsBuildingChecker const checker;
-    return m_addrWriter && checker(params.m_Types);
+    return m_addrWriter && ftypes::IsBuildingChecker::Instance()(params.m_Types);
   }
 
   class Place
diff --git a/indexer/ftypes_matcher.cpp b/indexer/ftypes_matcher.cpp
index 86040f3352..704a02780b 100644
--- a/indexer/ftypes_matcher.cpp
+++ b/indexer/ftypes_matcher.cpp
@@ -160,6 +160,12 @@ IsBuildingChecker::IsBuildingChecker()
   m_types.push_back(c.GetTypeByPath({ "building", "address" }));
 }
 
+IsBuildingChecker const & IsBuildingChecker::Instance()
+{
+  static const IsBuildingChecker inst;
+  return inst;
+}
+
 IsLocalityChecker::IsLocalityChecker()
 {
   Classificator const & c = classif();
diff --git a/indexer/ftypes_matcher.hpp b/indexer/ftypes_matcher.hpp
index 9ed2044cae..df194d3b46 100644
--- a/indexer/ftypes_matcher.hpp
+++ b/indexer/ftypes_matcher.hpp
@@ -80,16 +80,16 @@ public:
 
 class IsLinkChecker : public BaseChecker
 {
-public:
   IsLinkChecker();
+public:
   static IsLinkChecker const & Instance();
 };
 
 class IsBuildingChecker : public BaseChecker
 {
-public:
   IsBuildingChecker();
-
+public:
+  static IsBuildingChecker const & Instance();
   uint32_t GetMainType() const { return m_types[0]; }
 };
 
diff --git a/map/feature_styler.cpp b/map/feature_styler.cpp
index e7e83be8b1..cc194fa0c7 100644
--- a/map/feature_styler.cpp
+++ b/map/feature_styler.cpp
@@ -82,8 +82,7 @@ namespace di
     //}
 
     string houseNumber;
-    static ftypes::IsBuildingChecker const isBuilding;
-    if (isBuilding(f))
+    if (ftypes::IsBuildingChecker::Instance()(f))
     {
       houseNumber = f.GetHouseNumber();
       // Mark houses without names/numbers so user can select them by single tap.
diff --git a/search/house_detector.cpp b/search/house_detector.cpp
index 59d915ce93..fd5fa15c4b 100644
--- a/search/house_detector.cpp
+++ b/search/house_detector.cpp
@@ -707,18 +707,13 @@ HouseProjection const * MergedStreet::GetHousePivot(bool isOdd, bool & sign) con
   return 0;
 }
 
-uint32_t HouseDetector::GetBuildingType() const
-{
-  return m_buildingChecker.GetMainType();
-}
-
 template <class ProjectionCalcT>
 void HouseDetector::ReadHouse(FeatureType const & f, Street * st, ProjectionCalcT & calc)
 {
   string const houseNumber = f.GetHouseNumber();
 
   /// @todo After new data generation we can skip IsHouseNumber check here.
-  if (m_buildingChecker(f) && feature::IsHouseNumber(houseNumber))
+  if (ftypes::IsBuildingChecker::Instance()(f) && feature::IsHouseNumber(houseNumber))
   {
     HouseMapT::iterator const it = m_id2house.find(f.GetID());
     bool const isNew = it == m_id2house.end();
diff --git a/search/house_detector.hpp b/search/house_detector.hpp
index 6a0cd4388e..555962acf5 100644
--- a/search/house_detector.hpp
+++ b/search/house_detector.hpp
@@ -238,8 +238,6 @@ class HouseDetector
   int m_streetNum;
   double m_houseOffsetM;
 
-  ftypes::IsBuildingChecker m_buildingChecker;
-
   typedef pair<Street *, bool> StreetPtr;
   StreetPtr FindConnection(Street const * st, bool beg) const;
   void MergeStreets(Street * st);
@@ -256,8 +254,6 @@ public:
   HouseDetector(Index const * pIndex);
   ~HouseDetector();
 
-  uint32_t GetBuildingType() const;
-
   int LoadStreets(vector<FeatureID> const & ids);
   /// @return number of different joined streets.
   int MergeStreets();
diff --git a/search/search_query.cpp b/search/search_query.cpp
index 755c5afc50..db01f8eb0a 100644
--- a/search/search_query.cpp
+++ b/search/search_query.cpp
@@ -760,7 +760,7 @@ void Query::FlushHouses(Results & res, bool allMWMs, vector<FeatureID> const & s
       House const * h = houses[i].m_house;
       (res.*addFn)(MakeResult(impl::PreResult2(h->GetPosition(),
                                                h->GetNumber() + ", " + houses[i].m_street->GetName(),
-                                               m_houseDetector.GetBuildingType())));
+                                               ftypes::IsBuildingChecker::Instance().GetMainType())));
     }
   }
 }