diff --git a/indexer/ftypes_matcher.cpp b/indexer/ftypes_matcher.cpp
index 166c3d712b..d54d746f2e 100644
--- a/indexer/ftypes_matcher.cpp
+++ b/indexer/ftypes_matcher.cpp
@@ -474,7 +474,8 @@ IsPoiChecker::IsPoiChecker() : BaseChecker(1 /* level */)
     "historic",
     "railway",
     "highway",
-    "aeroway"
+    "aeroway",
+    "healthcare",
   };
 
   for (auto const & type : poiTypes)
diff --git a/indexer/ftypes_matcher.hpp b/indexer/ftypes_matcher.hpp
index 3b65be0840..3792a1dffb 100644
--- a/indexer/ftypes_matcher.hpp
+++ b/indexer/ftypes_matcher.hpp
@@ -320,6 +320,7 @@ public:
   DECLARE_CHECKER_INSTANCE(IsPisteChecker);
 };
 
+/// @todo Should be merged/replaced with search::IsPoiChecker in model.cpp ?
 class IsPoiChecker : public BaseChecker
 {
   IsPoiChecker();
@@ -474,7 +475,7 @@ class IsFeeTypeChecker : public BaseChecker
 public:
   DECLARE_CHECKER_INSTANCE(IsFeeTypeChecker);
 };
-    
+
 class IsToiletsChecker : public BaseChecker
 {
   IsToiletsChecker();
diff --git a/search/model.cpp b/search/model.cpp
index 62770414e3..d697d25508 100644
--- a/search/model.cpp
+++ b/search/model.cpp
@@ -55,13 +55,14 @@ public:
     Classificator const & c = classif();
 
     auto paths = {
-        "amenity", "healthcare", "historic", "office", "railway", "shop", "sport", "tourism", "craft"
+        "amenity",  "craft", "healthcare", "historic", "leisure", "office", "railway", "shop", "sport", "tourism",
     };
     for (auto const & path : paths)
       m_types.push_back(c.GetTypeByPath({path}));
   }
 };
 
+/// @todo Should be merged/replaced with ftypes::IsPoiChecker?
 class IsPoiChecker
 {
 public: