diff --git a/drape/overlay_handle.cpp b/drape/overlay_handle.cpp
index 1ad5da9162..ff71077f4f 100644
--- a/drape/overlay_handle.cpp
+++ b/drape/overlay_handle.cpp
@@ -233,7 +233,9 @@ std::string SquareHandle::GetOverlayDebugInfo()
 /// @todo remove minZoomLevel param from everywhere, its not used anymore.
 uint64_t CalculateOverlayPriority(int minZoomLevel, uint8_t rank, float depth)
 {
-  ASSERT(0 <= depth && depth <= 190000, (depth));
+  // Negative range is used for optional captions which are below all other overlays.
+  ASSERT(-kOverlaysMaxPriority <= depth && depth < kOverlaysMaxPriority, (depth));
+  depth += kOverlaysMaxPriority;
 
   // Even if minZoomLevel < 0 (-1 is not visible), we will get more consistent |minZoom| value (less is worse).
   ASSERT_GREATER_OR_EQUAL(minZoomLevel, 0, ());
diff --git a/drape/overlay_handle.hpp b/drape/overlay_handle.hpp
index 1f4ffc09be..a4205fb715 100644
--- a/drape/overlay_handle.hpp
+++ b/drape/overlay_handle.hpp
@@ -34,6 +34,9 @@ enum OverlayRank : uint8_t
   OverlayRanksCount
 };
 
+// Should be the same as OVERLAYS_MAX_PRIORITY in kothic.
+uint32_t constexpr kOverlaysMaxPriority = 10000;
+
 uint64_t constexpr kPriorityMaskZoomLevel = 0xFF0000000000FFFF;
 uint64_t constexpr kPriorityMaskManual    = 0x00FFFFFFFF00FFFF;
 uint64_t constexpr kPriorityMaskRank      = 0x0000000000FFFFFF;
diff --git a/indexer/displacement_manager.hpp b/indexer/displacement_manager.hpp
index 355894a8fd..6c92435769 100644
--- a/indexer/displacement_manager.hpp
+++ b/indexer/displacement_manager.hpp
@@ -176,7 +176,7 @@ private:
 
       // @todo: make sure features are prioritised the same way as in the run-time displacer,
       // see overlay_handle.cpp::CalculateOverlayPriority()
-      ASSERT(0 <= depth && depth <= 190000, (depth));
+      ASSERT(-10000 <= depth && depth < 10000, (depth));
       uint8_t rank = ft.GetRank();
       m_priority = (static_cast<uint32_t>(depth) << 8) | rank;
     }
diff --git a/tools/kothic b/tools/kothic
index 2d5c553af8..fbecca40c3 160000
--- a/tools/kothic
+++ b/tools/kothic
@@ -1 +1 @@
-Subproject commit 2d5c553af8a5e9ca0bd61091f8266baa56aae388
+Subproject commit fbecca40c3ea56a80bd2145efaa57416e6eaa066