diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7586c688..93296d2d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,34 @@
 # 印度占星 Skill 更新日志
 
+## v6.0.35（2026-06-05）—— Yoga 精度二次提升与 Top FP 收窄
+
+> **目标**：在 v6.0.34 已大幅提升 F1 后，继续按验证报告 Top FP/FN 队列修正高影响规则，优先降低过宽误报，同时保持质量门禁通过。
+
+### 对齐与修复
+
+- 修正 `matsya_yoga`：从过宽的“吉星三方+凶星凶宫”改为 PyJHora/PVR method=2 口径：Lagna 与 9宫仅吉星，5宫同时有吉/凶星，4宫与8宫仅凶星。
+- 修正 `sankha_yoga`：补齐 PyJHora/BVR-12 双分支：上升主强且5/6宫主互为 Kendra，或1/10宫主合于变动星座且9宫主强。
+- 修正 `bvr_103_guru_mangala_yoga`：从“木火互为 Kendra”收窄为 PyJHora 定义：木星与火星同宫或互为7宫。
+- 调整 `bvr_rogagrastha_precise`：对齐 PyJHora D1-safe 条件：上升主在Lagna合凶宫主，或弱上升主合角/三方主。
+- 修正 `bvr_kaalanirdesat_puthranaasa_yoga`：从单一“5宫主受土/Rahu伤”改为 PyJHora 229/230 组合条件。
+- 修复 `validate_logic_v2.py` 中 `kaahala_yoga` 的历史别名映射，确保 PyJHora `kaahala_yoga` 正确归入现有 `kahala_yoga`。
+- 为 custom Yoga 表达式新增 `occupants()`、`only_benefics_in_house()`、`only_malefics_in_house()`、`house_has_benefic()`、`house_has_malefic()`、`house_sign()`、`movable_house()` 与 `MOVABLE_SIGNS`，支持更接近源码的规则表达。
+
+### 当前验证结果
+
+- `scripts/validate_logic_v2.py`：Precision **83.84%**，Recall **69.64%**，F1 **76.08%**。
+- 相比 v6.0.34 的 F1 **74.13%**，提升 **+1.95 个百分点**；相比 v6.0.32/v6.0.33 基线 **58.08%**，累计提升 **+18.00 个百分点**。
+- `pytest tests/test_yoga_rules_integrity.py tests/test_dasha.py`：25 passed。
+- `scripts/run_quality_gate.py --skip-yoga-logic`：通过；完整 pytest 35 passed，BPHS/Ashtakavarga 不变量 18/18 通过，golden case 通过。
+
+### 已知后续优化点
+
+- 剩余 FN 主要集中在 `mathibhramana`、`matrunasa`、`rogagrastha`、`bahu_puthra`、`kahala`、`nishkapata`、`swaveeryaddhana` 等规则，其中部分需要 D9/Navamsa、tithi/waning Moon 或 Gulika 等当前 D1 静态验证数据未携带的信息。
+- 剩余 FP 主要集中在 `vanchana_chora_bheethi`、`sankha`、`bhratruvriddhi`、`mridanga`、`dehasthoulya`、`bahu_puthra`、`bandhu_pujya` 等规则。
+- v6.0.36 建议优先升级验证数据结构，把 D9、tithi、Gulika/Upagraha 等上下文纳入同盘验证，避免 D1-only 规则反复在召回和准确率之间拉扯。
+
+---
+
 ## v6.0.34（2026-06-05）—— Yoga 逻辑对齐与 F1 提升
 
 > **目标**：继续 v6.0.32 的“同盘逻辑正确性”路线，优先修复验证报告中高 FP/FN 的规则，而不是只堆规则名称。
diff --git a/SKILL.md b/SKILL.md
index 9addb487..c337dc4d 100644
--- a/SKILL.md
+++ b/SKILL.md
@@ -1,6 +1,6 @@
 ---
 name: jyotish-vedic-astrology
-version: 6.0.34
+version: 6.0.35
 description: 印度占星（Jyotish）专业解盘与推运系统。核心能力：PDF星盘输入→严谨解盘→精确推运应期输出。触发词：印度占星、吠陀占星、Jyotish、解盘、推运、星盘分析、Dasha、Transit、Nakshatra、Yoga、出生时间矫正、PDF星盘、读取PDF、分析PDF星盘、现代解读、误判纠错、Varga分盘、综合分析、过境分析、合盘、婚姻匹配、年运盘、Prashna、Argala、Jaimini、Shadbala、Ashtakavarga、HTML报告、深度解盘。
 ---
 
@@ -10,7 +10,7 @@ description: 印度占星（Jyotish）专业解盘与推运系统。核心能力
 > **严格路由**：`references/strict-workflow-router.md`（⭐涉及事业/婚恋/财务/应期/技法验证时必须优先读取）
 > **覆盖矩阵**：`references/technique-capability-matrix.md`（⭐判断技法 covered/partial/missing 时必须参考）
 > **机器注册表**：`references/technique_registry.json` + `scripts/audit_capabilities.py`（⭐用于自动审计与CI门禁）
-> **版本**：v6.0.34-yoga-logic-alignment | **详细变更**：`CHANGELOG.md`
+> **版本**：v6.0.35-yoga-precision-pass | **详细变更**：`CHANGELOG.md`
 
 ---
 
@@ -301,9 +301,9 @@ $PYTHON $SCRIPT <子命令> [参数]
 
 ---
 
-**版本**：v6.0.34-yoga-logic-alignment
+**版本**：v6.0.35-yoga-precision-pass
 **创建日期**：2026-04-20
-**最后更新**：2026-06-05（v6.0.34 对齐 PyJHora/B.V. Raman 多个高影响 Yoga 条件；当前 473 条 JSON 规则、379 条启用规则，D1/Rasi 逻辑验证 F1=74.13%，报告以 `references/validation_logic_report.json` 为准）
+**最后更新**：2026-06-05（v6.0.35 继续对齐 PyJHora/B.V. Raman 高影响 Yoga 条件，重点收窄 Top FP 并修复 Kahala 映射；当前 473 条 JSON 规则、379 条启用规则，D1/Rasi 逻辑验证 F1=76.08%，报告以 `references/validation_logic_report.json` 为准）
 
 ---
 
diff --git a/references/validation_logic_report.json b/references/validation_logic_report.json
index 0ada51f7..8194502f 100644
--- a/references/validation_logic_report.json
+++ b/references/validation_logic_report.json
@@ -2,7 +2,7 @@
   "summary": {
     "charts_tested": 60,
     "comparable_rules": 70,
-    "skill_total": 873,
+    "skill_total": 848,
     "pyjhora_total": 1021,
     "unmapped_pyjhora": 720,
     "missing_mappings": {
@@ -131,19 +131,29 @@
         "yuddhatpoorvadridhachitta_yoga"
       ]
     },
-    "agreements": 702,
-    "false_positives": 171,
-    "false_negatives": 319,
-    "precision": 0.8041,
-    "recall": 0.6876,
-    "f1": 0.7413
+    "agreements": 711,
+    "false_positives": 137,
+    "false_negatives": 310,
+    "precision": 0.8384,
+    "recall": 0.6964,
+    "f1": 0.7608
   },
   "false_positives": [
+    {
+      "chart": "Albert Einstein",
+      "rule_id": "koorma_yoga",
+      "rule_name": "Koorma Yoga"
+    },
     {
       "chart": "Albert Einstein",
       "rule_id": "bvr_bhratruvriddhi_precise",
       "rule_name": "Bhratruvriddhi Yoga"
     },
+    {
+      "chart": "Albert Einstein",
+      "rule_id": "mridanga_yoga",
+      "rule_name": "Mridanga Yoga"
+    },
     {
       "chart": "Albert Einstein",
       "rule_id": "vihaga_nabhasa",
@@ -154,36 +164,16 @@
       "rule_id": "bvr_dehasthoulya_yoga",
       "rule_name": "Dehasthoulya Yoga"
     },
-    {
-      "chart": "Albert Einstein",
-      "rule_id": "koorma_yoga",
-      "rule_name": "Koorma Yoga"
-    },
-    {
-      "chart": "Albert Einstein",
-      "rule_id": "mridanga_yoga",
-      "rule_name": "Mridanga Yoga"
-    },
     {
       "chart": "Marie Curie",
-      "rule_id": "bvr_103_guru_mangala_yoga",
-      "rule_name": "Guru Mangala Yoga"
+      "rule_id": "bvr_ayatna_griha_prapta_yoga",
+      "rule_name": "Ayatna Griha Prapta Yoga"
     },
     {
       "chart": "Marie Curie",
       "rule_id": "bvr_bahu_puthra_precise",
       "rule_name": "Bahu Puthra Yoga"
     },
-    {
-      "chart": "Marie Curie",
-      "rule_id": "brahma_yoga",
-      "rule_name": "Brahma Yoga"
-    },
-    {
-      "chart": "Marie Curie",
-      "rule_id": "bvr_kaalanirdesat_puthranaasa_yoga",
-      "rule_name": "Kaalanirdesat Puthranaasa Yoga"
-    },
     {
       "chart": "Marie Curie",
       "rule_id": "bvr_matru_sneha_yoga",
@@ -191,34 +181,34 @@
     },
     {
       "chart": "Marie Curie",
-      "rule_id": "bvr_ayatna_griha_prapta_yoga",
-      "rule_name": "Ayatna Griha Prapta Yoga"
-    },
-    {
-      "chart": "Marie Curie",
-      "rule_id": "sankha_yoga",
-      "rule_name": "Sankha Yoga"
+      "rule_id": "brahma_yoga",
+      "rule_name": "Brahma Yoga"
     },
     {
       "chart": "Stephen Hawking",
-      "rule_id": "bvr_kaalanirdesat_puthranaasa_yoga",
-      "rule_name": "Kaalanirdesat Puthranaasa Yoga"
+      "rule_id": "sankha_yoga",
+      "rule_name": "Sankha Yoga"
     },
     {
       "chart": "Stephen Hawking",
       "rule_id": "bvr_bahu_sthree_yoga",
       "rule_name": "Bahu Sthree Yoga"
     },
-    {
-      "chart": "Stephen Hawking",
-      "rule_id": "matsya_yoga",
-      "rule_name": "Matsya Yoga"
-    },
     {
       "chart": "Charles Darwin",
       "rule_id": "bvr_vanchana_chora_bheethi_yoga",
       "rule_name": "Vanchana Chora Bheethi Yoga"
     },
+    {
+      "chart": "Charles Darwin",
+      "rule_id": "sankha_yoga",
+      "rule_name": "Sankha Yoga"
+    },
+    {
+      "chart": "Thomas Edison",
+      "rule_id": "bvr_017_vosi_precise",
+      "rule_name": "Vosi Yoga"
+    },
     {
       "chart": "Thomas Edison",
       "rule_id": "bvr_002_sunapha_precise",
@@ -229,16 +219,6 @@
       "rule_id": "bvr_bhratruvriddhi_precise",
       "rule_name": "Bhratruvriddhi Yoga"
     },
-    {
-      "chart": "Thomas Edison",
-      "rule_id": "bvr_bahu_puthra_precise",
-      "rule_name": "Bahu Puthra Yoga"
-    },
-    {
-      "chart": "Thomas Edison",
-      "rule_id": "bvr_017_vosi_precise",
-      "rule_name": "Vosi Yoga"
-    },
     {
       "chart": "Thomas Edison",
       "rule_id": "bvr_018_ubhayachara_precise",
@@ -246,14 +226,19 @@
     },
     {
       "chart": "Thomas Edison",
-      "rule_id": "matsya_yoga",
-      "rule_name": "Matsya Yoga"
+      "rule_id": "sankha_yoga",
+      "rule_name": "Sankha Yoga"
     },
     {
       "chart": "Thomas Edison",
       "rule_id": "bvr_bandhu_pujya_yoga",
       "rule_name": "Bandhu Pujya Yoga"
     },
+    {
+      "chart": "Thomas Edison",
+      "rule_id": "bvr_bahu_puthra_precise",
+      "rule_name": "Bahu Puthra Yoga"
+    },
     {
       "chart": "Thomas Edison",
       "rule_id": "bvr_eka_puthra_precise",
@@ -264,11 +249,6 @@
       "rule_id": "bvr_vanchana_chora_bheethi_yoga",
       "rule_name": "Vanchana Chora Bheethi Yoga"
     },
-    {
-      "chart": "Max Planck",
-      "rule_id": "bvr_bandhubhisthyaktha_precise",
-      "rule_name": "Bandhubhisthyaktha Yoga"
-    },
     {
       "chart": "Max Planck",
       "rule_id": "bvr_dehasthoulya_yoga",
@@ -280,9 +260,14 @@
       "rule_name": "Mridanga Yoga"
     },
     {
-      "chart": "Niels Bohr",
-      "rule_id": "bvr_bhratruvriddhi_precise",
-      "rule_name": "Bhratruvriddhi Yoga"
+      "chart": "Max Planck",
+      "rule_id": "bvr_bandhubhisthyaktha_precise",
+      "rule_name": "Bandhubhisthyaktha Yoga"
+    },
+    {
+      "chart": "Max Planck",
+      "rule_id": "bvr_kaalanirdesat_puthranaasa_yoga",
+      "rule_name": "Kaalanirdesat Puthranaasa Yoga"
     },
     {
       "chart": "Niels Bohr",
@@ -290,19 +275,9 @@
       "rule_name": "Vihaga Nabhasa Yoga"
     },
     {
-      "chart": "Richard Feynman",
-      "rule_id": "bvr_103_guru_mangala_yoga",
-      "rule_name": "Guru Mangala Yoga"
-    },
-    {
-      "chart": "Richard Feynman",
-      "rule_id": "bvr_dehasthoulya_yoga",
-      "rule_name": "Dehasthoulya Yoga"
-    },
-    {
-      "chart": "Richard Feynman",
-      "rule_id": "bvr_003_anapha_precise",
-      "rule_name": "Anaphaa Yoga"
+      "chart": "Niels Bohr",
+      "rule_id": "bvr_bhratruvriddhi_precise",
+      "rule_name": "Bhratruvriddhi Yoga"
     },
     {
       "chart": "Richard Feynman",
@@ -311,8 +286,8 @@
     },
     {
       "chart": "Richard Feynman",
-      "rule_id": "matsya_yoga",
-      "rule_name": "Matsya Yoga"
+      "rule_id": "bvr_003_anapha_precise",
+      "rule_name": "Anaphaa Yoga"
     },
     {
       "chart": "Richard Feynman",
@@ -320,9 +295,14 @@
       "rule_name": "Dharidhra Yoga"
     },
     {
-      "chart": "Mahatma Gandhi",
-      "rule_id": "bvr_utthama_graha_yoga",
-      "rule_name": "Utthama Griha Yoga"
+      "chart": "Richard Feynman",
+      "rule_id": "bvr_dehasthoulya_yoga",
+      "rule_name": "Dehasthoulya Yoga"
+    },
+    {
+      "chart": "Richard Feynman",
+      "rule_id": "bvr_kaalanirdesat_puthranaasa_yoga",
+      "rule_name": "Kaalanirdesat Puthranaasa Yoga"
     },
     {
       "chart": "Mahatma Gandhi",
@@ -331,13 +311,8 @@
     },
     {
       "chart": "Mahatma Gandhi",
-      "rule_id": "matsya_yoga",
-      "rule_name": "Matsya Yoga"
-    },
-    {
-      "chart": "Jawaharlal Nehru",
-      "rule_id": "bvr_103_guru_mangala_yoga",
-      "rule_name": "Guru Mangala Yoga"
+      "rule_id": "bvr_utthama_graha_yoga",
+      "rule_name": "Utthama Griha Yoga"
     },
     {
       "chart": "Jawaharlal Nehru",
@@ -349,41 +324,36 @@
       "rule_id": "mridanga_yoga",
       "rule_name": "Mridanga Yoga"
     },
-    {
-      "chart": "Indira Gandhi",
-      "rule_id": "bvr_103_guru_mangala_yoga",
-      "rule_name": "Guru Mangala Yoga"
-    },
     {
       "chart": "Indira Gandhi",
       "rule_id": "bvr_dehasthoulya_yoga",
       "rule_name": "Dehasthoulya Yoga"
     },
-    {
-      "chart": "Indira Gandhi",
-      "rule_id": "bvr_003_anapha_precise",
-      "rule_name": "Anaphaa Yoga"
-    },
     {
       "chart": "Indira Gandhi",
       "rule_id": "bvr_bandhu_pujya_yoga",
       "rule_name": "Bandhu Pujya Yoga"
     },
+    {
+      "chart": "Indira Gandhi",
+      "rule_id": "bvr_003_anapha_precise",
+      "rule_name": "Anaphaa Yoga"
+    },
     {
       "chart": "Winston Churchill",
       "rule_id": "bvr_dehasthoulya_yoga",
       "rule_name": "Dehasthoulya Yoga"
     },
-    {
-      "chart": "Winston Churchill",
-      "rule_id": "bvr_kaalanirdesat_puthranaasa_yoga",
-      "rule_name": "Kaalanirdesat Puthranaasa Yoga"
-    },
     {
       "chart": "Winston Churchill",
       "rule_id": "bheri_yoga",
       "rule_name": "Bheri Yoga"
     },
+    {
+      "chart": "John F. Kennedy",
+      "rule_id": "bvr_vanchana_chora_bheethi_yoga",
+      "rule_name": "Vanchana Chora Bheethi Yoga"
+    },
     {
       "chart": "John F. Kennedy",
       "rule_id": "bvr_dehasthoulya_yoga",
@@ -394,16 +364,6 @@
       "rule_id": "brahma_yoga",
       "rule_name": "Brahma Yoga"
     },
-    {
-      "chart": "John F. Kennedy",
-      "rule_id": "bvr_kaalanirdesat_puthranaasa_yoga",
-      "rule_name": "Kaalanirdesat Puthranaasa Yoga"
-    },
-    {
-      "chart": "John F. Kennedy",
-      "rule_id": "bvr_vanchana_chora_bheethi_yoga",
-      "rule_name": "Vanchana Chora Bheethi Yoga"
-    },
     {
       "chart": "John F. Kennedy",
       "rule_id": "bvr_dharidhra_11_precise",
@@ -411,13 +371,8 @@
     },
     {
       "chart": "Nelson Mandela",
-      "rule_id": "bvr_103_guru_mangala_yoga",
-      "rule_name": "Guru Mangala Yoga"
-    },
-    {
-      "chart": "Abraham Lincoln",
-      "rule_id": "bvr_002_sunapha_precise",
-      "rule_name": "Sunaphaa Yoga"
+      "rule_id": "sankha_yoga",
+      "rule_name": "Sankha Yoga"
     },
     {
       "chart": "Abraham Lincoln",
@@ -429,6 +384,16 @@
       "rule_id": "bvr_sada_sanchara_precise",
       "rule_name": "Sada Sanchara Yoga"
     },
+    {
+      "chart": "Abraham Lincoln",
+      "rule_id": "bvr_002_sunapha_precise",
+      "rule_name": "Sunaphaa Yoga"
+    },
+    {
+      "chart": "Abraham Lincoln",
+      "rule_id": "sankha_yoga",
+      "rule_name": "Sankha Yoga"
+    },
     {
       "chart": "Margaret Thatcher",
       "rule_id": "bvr_004_duradhara_precise",
@@ -439,16 +404,16 @@
       "rule_id": "bvr_002_sunapha_precise",
       "rule_name": "Sunaphaa Yoga"
     },
-    {
-      "chart": "Margaret Thatcher",
-      "rule_id": "bvr_103_guru_mangala_yoga",
-      "rule_name": "Guru Mangala Yoga"
-    },
     {
       "chart": "Barack Obama",
       "rule_id": "bvr_bandhu_pujya_yoga",
       "rule_name": "Bandhu Pujya Yoga"
     },
+    {
+      "chart": "Rabindranath Tagore",
+      "rule_id": "bvr_vanchana_chora_bheethi_yoga",
+      "rule_name": "Vanchana Chora Bheethi Yoga"
+    },
     {
       "chart": "Rabindranath Tagore",
       "rule_id": "bvr_002_sunapha_precise",
@@ -464,20 +429,10 @@
       "rule_id": "bvr_bahu_puthra_precise",
       "rule_name": "Bahu Puthra Yoga"
     },
-    {
-      "chart": "Rabindranath Tagore",
-      "rule_id": "bvr_vanchana_chora_bheethi_yoga",
-      "rule_name": "Vanchana Chora Bheethi Yoga"
-    },
-    {
-      "chart": "Rabindranath Tagore",
-      "rule_id": "sankha_yoga",
-      "rule_name": "Sankha Yoga"
-    },
     {
       "chart": "Wolfgang Mozart",
-      "rule_id": "bvr_103_guru_mangala_yoga",
-      "rule_name": "Guru Mangala Yoga"
+      "rule_id": "bvr_bahu_puthra_precise",
+      "rule_name": "Bahu Puthra Yoga"
     },
     {
       "chart": "Wolfgang Mozart",
@@ -489,21 +444,11 @@
       "rule_id": "bvr_utthama_graha_yoga",
       "rule_name": "Utthama Griha Yoga"
     },
-    {
-      "chart": "Wolfgang Mozart",
-      "rule_id": "bvr_bahu_puthra_precise",
-      "rule_name": "Bahu Puthra Yoga"
-    },
     {
       "chart": "Pablo Picasso",
       "rule_id": "bvr_018_ubhayachara_precise",
       "rule_name": "Ubhayachara Yoga"
     },
-    {
-      "chart": "Vincent van Gogh",
-      "rule_id": "bvr_103_guru_mangala_yoga",
-      "rule_name": "Guru Mangala Yoga"
-    },
     {
       "chart": "Vincent van Gogh",
       "rule_id": "koorma_yoga",
@@ -515,34 +460,19 @@
       "rule_name": "Dharidhra Yoga"
     },
     {
-      "chart": "Vincent van Gogh",
-      "rule_id": "matsya_yoga",
-      "rule_name": "Matsya Yoga"
+      "chart": "Charlie Chaplin",
+      "rule_id": "bvr_vanchana_chora_bheethi_yoga",
+      "rule_name": "Vanchana Chora Bheethi Yoga"
     },
     {
       "chart": "Charlie Chaplin",
       "rule_id": "mridanga_yoga",
       "rule_name": "Mridanga Yoga"
     },
-    {
-      "chart": "Charlie Chaplin",
-      "rule_id": "bvr_vanchana_chora_bheethi_yoga",
-      "rule_name": "Vanchana Chora Bheethi Yoga"
-    },
-    {
-      "chart": "Charlie Chaplin",
-      "rule_id": "bvr_kaalanirdesat_puthranaasa_yoga",
-      "rule_name": "Kaalanirdesat Puthranaasa Yoga"
-    },
-    {
-      "chart": "Charlie Chaplin",
-      "rule_id": "matsya_yoga",
-      "rule_name": "Matsya Yoga"
-    },
     {
       "chart": "Elvis Presley",
-      "rule_id": "matsya_yoga",
-      "rule_name": "Matsya Yoga"
+      "rule_id": "sankha_yoga",
+      "rule_name": "Sankha Yoga"
     },
     {
       "chart": "Michael Jackson",
@@ -554,40 +484,20 @@
       "rule_id": "bvr_bahu_sthree_yoga",
       "rule_name": "Bahu Sthree Yoga"
     },
-    {
-      "chart": "A.R. Rahman",
-      "rule_id": "bvr_kaalanirdesat_puthranaasa_yoga",
-      "rule_name": "Kaalanirdesat Puthranaasa Yoga"
-    },
-    {
-      "chart": "A.R. Rahman",
-      "rule_id": "bvr_bandhubhisthyaktha_precise",
-      "rule_name": "Bandhubhisthyaktha Yoga"
-    },
     {
       "chart": "A.R. Rahman",
       "rule_id": "bvr_vanchana_chora_bheethi_yoga",
       "rule_name": "Vanchana Chora Bheethi Yoga"
     },
-    {
-      "chart": "A.R. Rahman",
-      "rule_id": "matsya_yoga",
-      "rule_name": "Matsya Yoga"
-    },
     {
       "chart": "A.R. Rahman",
       "rule_id": "sankha_yoga",
       "rule_name": "Sankha Yoga"
     },
     {
-      "chart": "Lata Mangeshkar",
-      "rule_id": "kahala_yoga",
-      "rule_name": "Kahala Yoga"
-    },
-    {
-      "chart": "Lata Mangeshkar",
-      "rule_id": "bvr_bahu_sthree_yoga",
-      "rule_name": "Bahu Sthree Yoga"
+      "chart": "A.R. Rahman",
+      "rule_id": "bvr_bandhubhisthyaktha_precise",
+      "rule_name": "Bandhubhisthyaktha Yoga"
     },
     {
       "chart": "Lata Mangeshkar",
@@ -599,6 +509,16 @@
       "rule_id": "mridanga_yoga",
       "rule_name": "Mridanga Yoga"
     },
+    {
+      "chart": "Lata Mangeshkar",
+      "rule_id": "kahala_yoga",
+      "rule_name": "Kahala Yoga"
+    },
+    {
+      "chart": "Lata Mangeshkar",
+      "rule_id": "bvr_bahu_sthree_yoga",
+      "rule_name": "Bahu Sthree Yoga"
+    },
     {
       "chart": "Steve Jobs",
       "rule_id": "vihaga_nabhasa",
@@ -629,6 +549,11 @@
       "rule_id": "bvr_vanchana_chora_bheethi_yoga",
       "rule_name": "Vanchana Chora Bheethi Yoga"
     },
+    {
+      "chart": "Jeff Bezos",
+      "rule_id": "sankha_yoga",
+      "rule_name": "Sankha Yoga"
+    },
     {
       "chart": "Jeff Bezos",
       "rule_id": "bvr_002_sunapha_precise",
@@ -639,25 +564,15 @@
       "rule_id": "bvr_bahu_puthra_precise",
       "rule_name": "Bahu Puthra Yoga"
     },
-    {
-      "chart": "Jeff Bezos",
-      "rule_id": "sankha_yoga",
-      "rule_name": "Sankha Yoga"
-    },
-    {
-      "chart": "Warren Buffett",
-      "rule_id": "bvr_bhratruvriddhi_precise",
-      "rule_name": "Bhratruvriddhi Yoga"
-    },
     {
       "chart": "Warren Buffett",
       "rule_id": "mridanga_yoga",
       "rule_name": "Mridanga Yoga"
     },
     {
-      "chart": "Mukesh Ambani",
-      "rule_id": "bvr_103_guru_mangala_yoga",
-      "rule_name": "Guru Mangala Yoga"
+      "chart": "Warren Buffett",
+      "rule_id": "bvr_bhratruvriddhi_precise",
+      "rule_name": "Bhratruvriddhi Yoga"
     },
     {
       "chart": "Mukesh Ambani",
@@ -669,21 +584,6 @@
       "rule_id": "bvr_bahu_sthree_yoga",
       "rule_name": "Bahu Sthree Yoga"
     },
-    {
-      "chart": "Mukesh Ambani",
-      "rule_id": "matsya_yoga",
-      "rule_name": "Matsya Yoga"
-    },
-    {
-      "chart": "Ratan Tata",
-      "rule_id": "bvr_yukthi_samanwithavagmi_yoga",
-      "rule_name": "Yukthi Samanwithavagmi Yoga"
-    },
-    {
-      "chart": "Ratan Tata",
-      "rule_id": "bvr_kaalanirdesat_puthranaasa_yoga",
-      "rule_name": "Kaalanirdesat Puthranaasa Yoga"
-    },
     {
       "chart": "Ratan Tata",
       "rule_id": "sankha_yoga",
@@ -691,8 +591,8 @@
     },
     {
       "chart": "Ratan Tata",
-      "rule_id": "matsya_yoga",
-      "rule_name": "Matsya Yoga"
+      "rule_id": "bvr_yukthi_samanwithavagmi_yoga",
+      "rule_name": "Yukthi Samanwithavagmi Yoga"
     },
     {
       "chart": "Narayana Murthy",
@@ -706,29 +606,19 @@
     },
     {
       "chart": "Azim Premji",
-      "rule_id": "sankha_yoga",
-      "rule_name": "Sankha Yoga"
+      "rule_id": "bvr_kaalanirdesat_puthranaasa_yoga",
+      "rule_name": "Kaalanirdesat Puthranaasa Yoga"
     },
     {
       "chart": "Dhirubhai Ambani",
       "rule_id": "bvr_dehasthoulya_yoga",
       "rule_name": "Dehasthoulya Yoga"
     },
-    {
-      "chart": "Dhirubhai Ambani",
-      "rule_id": "sankha_yoga",
-      "rule_name": "Sankha Yoga"
-    },
     {
       "chart": "Sachin Tendulkar",
       "rule_id": "bvr_vanchana_chora_bheethi_yoga",
       "rule_name": "Vanchana Chora Bheethi Yoga"
     },
-    {
-      "chart": "Sachin Tendulkar",
-      "rule_id": "matsya_yoga",
-      "rule_name": "Matsya Yoga"
-    },
     {
       "chart": "Virat Kohli",
       "rule_id": "bvr_yukthi_samanwithavagmi_yoga",
@@ -741,8 +631,8 @@
     },
     {
       "chart": "Muhammad Ali",
-      "rule_id": "kahala_yoga",
-      "rule_name": "Kahala Yoga"
+      "rule_id": "sankha_yoga",
+      "rule_name": "Sankha Yoga"
     },
     {
       "chart": "Muhammad Ali",
@@ -750,39 +640,14 @@
       "rule_name": "Bandhu Pujya Yoga"
     },
     {
-      "chart": "Michael Jordan",
-      "rule_id": "bvr_bahu_puthra_precise",
-      "rule_name": "Bahu Puthra Yoga"
-    },
-    {
-      "chart": "Michael Jordan",
-      "rule_id": "sankha_yoga",
-      "rule_name": "Sankha Yoga"
-    },
-    {
-      "chart": "Lionel Messi",
-      "rule_id": "bvr_004_duradhara_precise",
-      "rule_name": "Duradhara Yoga"
-    },
-    {
-      "chart": "Lionel Messi",
+      "chart": "Muhammad Ali",
       "rule_id": "kahala_yoga",
       "rule_name": "Kahala Yoga"
     },
     {
-      "chart": "Lionel Messi",
-      "rule_id": "bvr_002_sunapha_precise",
-      "rule_name": "Sunaphaa Yoga"
-    },
-    {
-      "chart": "Lionel Messi",
-      "rule_id": "bvr_dehasthoulya_yoga",
-      "rule_name": "Dehasthoulya Yoga"
-    },
-    {
-      "chart": "Lionel Messi",
-      "rule_id": "brahma_yoga",
-      "rule_name": "Brahma Yoga"
+      "chart": "Michael Jordan",
+      "rule_id": "bvr_bahu_puthra_precise",
+      "rule_name": "Bahu Puthra Yoga"
     },
     {
       "chart": "Lionel Messi",
@@ -791,24 +656,39 @@
     },
     {
       "chart": "Lionel Messi",
-      "rule_id": "matsya_yoga",
-      "rule_name": "Matsya Yoga"
+      "rule_id": "bvr_002_sunapha_precise",
+      "rule_name": "Sunaphaa Yoga"
     },
     {
       "chart": "Lionel Messi",
-      "rule_id": "sankha_yoga",
-      "rule_name": "Sankha Yoga"
+      "rule_id": "brahma_yoga",
+      "rule_name": "Brahma Yoga"
     },
     {
-      "chart": "Cristiano Ronaldo",
-      "rule_id": "bvr_utthama_graha_yoga",
-      "rule_name": "Utthama Griha Yoga"
+      "chart": "Lionel Messi",
+      "rule_id": "bvr_dehasthoulya_yoga",
+      "rule_name": "Dehasthoulya Yoga"
+    },
+    {
+      "chart": "Lionel Messi",
+      "rule_id": "bvr_004_duradhara_precise",
+      "rule_name": "Duradhara Yoga"
+    },
+    {
+      "chart": "Lionel Messi",
+      "rule_id": "kahala_yoga",
+      "rule_name": "Kahala Yoga"
     },
     {
       "chart": "Cristiano Ronaldo",
       "rule_id": "bvr_vanchana_chora_bheethi_yoga",
       "rule_name": "Vanchana Chora Bheethi Yoga"
     },
+    {
+      "chart": "Cristiano Ronaldo",
+      "rule_id": "sankha_yoga",
+      "rule_name": "Sankha Yoga"
+    },
     {
       "chart": "Cristiano Ronaldo",
       "rule_id": "brahma_yoga",
@@ -816,8 +696,8 @@
     },
     {
       "chart": "Cristiano Ronaldo",
-      "rule_id": "matsya_yoga",
-      "rule_name": "Matsya Yoga"
+      "rule_id": "bvr_utthama_graha_yoga",
+      "rule_name": "Utthama Griha Yoga"
     },
     {
       "chart": "Serena Williams",
@@ -836,39 +716,29 @@
     },
     {
       "chart": "Serena Williams",
-      "rule_id": "matsya_yoga",
-      "rule_name": "Matsya Yoga"
-    },
-    {
-      "chart": "Roger Federer",
-      "rule_id": "bvr_103_guru_mangala_yoga",
-      "rule_name": "Guru Mangala Yoga"
+      "rule_id": "bvr_kaalanirdesat_puthranaasa_yoga",
+      "rule_name": "Kaalanirdesat Puthranaasa Yoga"
     },
     {
       "chart": "Roger Federer",
       "rule_id": "bvr_bhratruvriddhi_precise",
       "rule_name": "Bhratruvriddhi Yoga"
     },
-    {
-      "chart": "Swami Vivekananda",
-      "rule_id": "bvr_kaalanirdesat_puthranaasa_yoga",
-      "rule_name": "Kaalanirdesat Puthranaasa Yoga"
-    },
     {
       "chart": "Amitabh Bachchan",
-      "rule_id": "bvr_103_guru_mangala_yoga",
-      "rule_name": "Guru Mangala Yoga"
-    },
-    {
-      "chart": "Amitabh Bachchan",
-      "rule_id": "bvr_003_anapha_precise",
-      "rule_name": "Anaphaa Yoga"
+      "rule_id": "sankha_yoga",
+      "rule_name": "Sankha Yoga"
     },
     {
       "chart": "Amitabh Bachchan",
       "rule_id": "bvr_bandhu_pujya_yoga",
       "rule_name": "Bandhu Pujya Yoga"
     },
+    {
+      "chart": "Amitabh Bachchan",
+      "rule_id": "bvr_003_anapha_precise",
+      "rule_name": "Anaphaa Yoga"
+    },
     {
       "chart": "Princess Diana",
       "rule_id": "bvr_vanchana_chora_bheethi_yoga",
@@ -884,11 +754,6 @@
       "rule_id": "mridanga_yoga",
       "rule_name": "Mridanga Yoga"
     },
-    {
-      "chart": "Dalai Lama",
-      "rule_id": "bvr_bhratruvriddhi_precise",
-      "rule_name": "Bhratruvriddhi Yoga"
-    },
     {
       "chart": "Dalai Lama",
       "rule_id": "bvr_matrunasa_precise",
@@ -896,8 +761,13 @@
     },
     {
       "chart": "Dalai Lama",
-      "rule_id": "matsya_yoga",
-      "rule_name": "Matsya Yoga"
+      "rule_id": "bvr_bhratruvriddhi_precise",
+      "rule_name": "Bhratruvriddhi Yoga"
+    },
+    {
+      "chart": "Pope Francis",
+      "rule_id": "bvr_sada_sanchara_precise",
+      "rule_name": "Sada Sanchara Yoga"
     },
     {
       "chart": "Pope Francis",
@@ -906,13 +776,8 @@
     },
     {
       "chart": "Pope Francis",
-      "rule_id": "bvr_103_guru_mangala_yoga",
-      "rule_name": "Guru Mangala Yoga"
-    },
-    {
-      "chart": "Pope Francis",
-      "rule_id": "bvr_sada_sanchara_precise",
-      "rule_name": "Sada Sanchara Yoga"
+      "rule_id": "bvr_bandhu_pujya_yoga",
+      "rule_name": "Bandhu Pujya Yoga"
     },
     {
       "chart": "Pope Francis",
@@ -920,35 +785,15 @@
       "rule_name": "Anaphaa Yoga"
     },
     {
-      "chart": "Pope Francis",
+      "chart": "Osho",
       "rule_id": "bvr_bandhu_pujya_yoga",
       "rule_name": "Bandhu Pujya Yoga"
     },
-    {
-      "chart": "Pope Francis",
-      "rule_id": "sankha_yoga",
-      "rule_name": "Sankha Yoga"
-    },
     {
       "chart": "Osho",
       "rule_id": "kahala_yoga",
       "rule_name": "Kahala Yoga"
     },
-    {
-      "chart": "Osho",
-      "rule_id": "bvr_bandhu_pujya_yoga",
-      "rule_name": "Bandhu Pujya Yoga"
-    },
-    {
-      "chart": "Osho",
-      "rule_id": "matsya_yoga",
-      "rule_name": "Matsya Yoga"
-    },
-    {
-      "chart": "J. Krishnamurti",
-      "rule_id": "bvr_bahu_sthree_yoga",
-      "rule_name": "Bahu Sthree Yoga"
-    },
     {
       "chart": "J. Krishnamurti",
       "rule_id": "bvr_vanchana_chora_bheethi_yoga",
@@ -956,8 +801,8 @@
     },
     {
       "chart": "J. Krishnamurti",
-      "rule_id": "matsya_yoga",
-      "rule_name": "Matsya Yoga"
+      "rule_id": "mridanga_yoga",
+      "rule_name": "Mridanga Yoga"
     },
     {
       "chart": "J. Krishnamurti",
@@ -966,26 +811,6 @@
     },
     {
       "chart": "J. Krishnamurti",
-      "rule_id": "mridanga_yoga",
-      "rule_name": "Mridanga Yoga"
-    },
-    {
-      "chart": "Ramana Maharshi",
-      "rule_id": "bvr_kaalanirdesat_puthranaasa_yoga",
-      "rule_name": "Kaalanirdesat Puthranaasa Yoga"
-    },
-    {
-      "chart": "Paramahansa Yogananda",
-      "rule_id": "sankha_yoga",
-      "rule_name": "Sankha Yoga"
-    },
-    {
-      "chart": "Paramahansa Yogananda",
-      "rule_id": "bvr_kaalanirdesat_puthranaasa_yoga",
-      "rule_name": "Kaalanirdesat Puthranaasa Yoga"
-    },
-    {
-      "chart": "Paramahansa Yogananda",
       "rule_id": "bvr_bahu_sthree_yoga",
       "rule_name": "Bahu Sthree Yoga"
     },
@@ -993,9 +818,40 @@
       "chart": "Paramahansa Yogananda",
       "rule_id": "bvr_sada_sanchara_precise",
       "rule_name": "Sada Sanchara Yoga"
+    },
+    {
+      "chart": "Paramahansa Yogananda",
+      "rule_id": "bvr_bahu_sthree_yoga",
+      "rule_name": "Bahu Sthree Yoga"
     }
   ],
   "false_negatives": [
+    {
+      "chart": "Albert Einstein",
+      "rule_id": "bvr_bandhubhisthyaktha_precise",
+      "rule_name": "Bandhubhisthyaktha Yoga",
+      "pyjhora_names": [
+        "bandhubhisthyaktha_yoga"
+      ]
+    },
+    {
+      "chart": "Albert Einstein",
+      "rule_id": "bvr_matrunasa_precise",
+      "rule_name": "Matrunasa Yoga",
+      "pyjhora_names": [
+        "matrunasa_yoga_198",
+        "matrunasa_yoga_199"
+      ]
+    },
+    {
+      "chart": "Albert Einstein",
+      "rule_id": "bvr_bandhu_pujya_yoga",
+      "rule_name": "Bandhu Pujya Yoga",
+      "pyjhora_names": [
+        "bandhu_pujya_yoga_193",
+        "bandhu_pujya_yoga_194"
+      ]
+    },
     {
       "chart": "Albert Einstein",
       "rule_id": "bvr_bahu_puthra_precise",
@@ -1005,23 +861,6 @@
         "bahu_puthra_yoga_221"
       ]
     },
-    {
-      "chart": "Albert Einstein",
-      "rule_id": "bvr_kaalanirdesat_puthranaasa_yoga",
-      "rule_name": "Kaalanirdesat Puthranaasa Yoga",
-      "pyjhora_names": [
-        "kaalanirdesat_puthranaasa_yoga_230",
-        "kaalanirdesat_puthranaasa_yoga_229"
-      ]
-    },
-    {
-      "chart": "Albert Einstein",
-      "rule_id": "bvr_bandhubhisthyaktha_precise",
-      "rule_name": "Bandhubhisthyaktha Yoga",
-      "pyjhora_names": [
-        "bandhubhisthyaktha_yoga"
-      ]
-    },
     {
       "chart": "Albert Einstein",
       "rule_id": "bvr_dharidhra_11_precise",
@@ -1038,11 +877,11 @@
     },
     {
       "chart": "Albert Einstein",
-      "rule_id": "bvr_bandhu_pujya_yoga",
-      "rule_name": "Bandhu Pujya Yoga",
+      "rule_id": "bvr_kaalanirdesat_puthranaasa_yoga",
+      "rule_name": "Kaalanirdesat Puthranaasa Yoga",
       "pyjhora_names": [
-        "bandhu_pujya_yoga_193",
-        "bandhu_pujya_yoga_194"
+        "kaalanirdesat_puthranaasa_yoga_230",
+        "kaalanirdesat_puthranaasa_yoga_229"
       ]
     },
     {
@@ -1057,21 +896,12 @@
         "mathibhramana_yoga_variation"
       ]
     },
-    {
-      "chart": "Albert Einstein",
-      "rule_id": "bvr_matrunasa_precise",
-      "rule_name": "Matrunasa Yoga",
-      "pyjhora_names": [
-        "matrunasa_yoga_198",
-        "matrunasa_yoga_199"
-      ]
-    },
     {
       "chart": "Marie Curie",
-      "rule_id": "kahala_yoga",
-      "rule_name": "Kahala Yoga",
+      "rule_id": "bvr_amala_precise",
+      "rule_name": "Amala Yoga",
       "pyjhora_names": [
-        "kaahala_yoga"
+        "amala_yoga"
       ]
     },
     {
@@ -1082,18 +912,6 @@
         "rogagrastha_yoga"
       ]
     },
-    {
-      "chart": "Marie Curie",
-      "rule_id": "bvr_mathibhramana_yoga",
-      "rule_name": "Mathibhramana Yoga",
-      "pyjhora_names": [
-        "mathibhramana_yoga_291",
-        "mathibhramana_yoga_292",
-        "mathibhramana_yoga_293",
-        "mathibhramana_yoga_294",
-        "mathibhramana_yoga_variation"
-      ]
-    },
     {
       "chart": "Marie Curie",
       "rule_id": "bvr_bhaga_chumbana_yoga",
@@ -1104,6 +922,26 @@
     },
     {
       "chart": "Marie Curie",
+      "rule_id": "kahala_yoga",
+      "rule_name": "Kahala Yoga",
+      "pyjhora_names": [
+        "kaahala_yoga"
+      ]
+    },
+    {
+      "chart": "Marie Curie",
+      "rule_id": "bvr_mathibhramana_yoga",
+      "rule_name": "Mathibhramana Yoga",
+      "pyjhora_names": [
+        "mathibhramana_yoga_291",
+        "mathibhramana_yoga_292",
+        "mathibhramana_yoga_293",
+        "mathibhramana_yoga_294",
+        "mathibhramana_yoga_variation"
+      ]
+    },
+    {
+      "chart": "Nikola Tesla",
       "rule_id": "bvr_amala_precise",
       "rule_name": "Amala Yoga",
       "pyjhora_names": [
@@ -1112,18 +950,13 @@
     },
     {
       "chart": "Nikola Tesla",
-      "rule_id": "kahala_yoga",
-      "rule_name": "Kahala Yoga",
+      "rule_id": "bvr_nishkapata_precise",
+      "rule_name": "Nishkapata Yoga",
       "pyjhora_names": [
-        "kaahala_yoga"
-      ]
-    },
-    {
-      "chart": "Nikola Tesla",
-      "rule_id": "bvr_rogagrastha_precise",
-      "rule_name": "Rogagrastha Yoga",
-      "pyjhora_names": [
-        "rogagrastha_yoga"
+        "nishkapata_yoga_205",
+        "nishkapata_yoga_206",
+        "kapata_yoga_202",
+        "kapata_yoga_204"
       ]
     },
     {
@@ -1144,25 +977,6 @@
     },
     {
       "chart": "Nikola Tesla",
-      "rule_id": "bvr_nishkapata_precise",
-      "rule_name": "Nishkapata Yoga",
-      "pyjhora_names": [
-        "nishkapata_yoga_205",
-        "nishkapata_yoga_206",
-        "kapata_yoga_202",
-        "kapata_yoga_204"
-      ]
-    },
-    {
-      "chart": "Nikola Tesla",
-      "rule_id": "bvr_amala_precise",
-      "rule_name": "Amala Yoga",
-      "pyjhora_names": [
-        "amala_yoga"
-      ]
-    },
-    {
-      "chart": "Stephen Hawking",
       "rule_id": "kahala_yoga",
       "rule_name": "Kahala Yoga",
       "pyjhora_names": [
@@ -1170,12 +984,12 @@
       ]
     },
     {
-      "chart": "Stephen Hawking",
-      "rule_id": "bvr_bahu_puthra_precise",
-      "rule_name": "Bahu Puthra Yoga",
+      "chart": "Nikola Tesla",
+      "rule_id": "bvr_kaalanirdesat_puthranaasa_yoga",
+      "rule_name": "Kaalanirdesat Puthranaasa Yoga",
       "pyjhora_names": [
-        "bahu_puthra_yoga_220",
-        "bahu_puthra_yoga_221"
+        "kaalanirdesat_puthranaasa_yoga_230",
+        "kaalanirdesat_puthranaasa_yoga_229"
       ]
     },
     {
@@ -1206,12 +1020,45 @@
       ]
     },
     {
-      "chart": "Charles Darwin",
-      "rule_id": "bvr_krisanga_yoga",
-      "rule_name": "Krisanga Yoga",
+      "chart": "Stephen Hawking",
+      "rule_id": "bvr_bahu_puthra_precise",
+      "rule_name": "Bahu Puthra Yoga",
       "pyjhora_names": [
-        "krisanga_yoga_112",
-        "krisanga_yoga_113"
+        "bahu_puthra_yoga_220",
+        "bahu_puthra_yoga_221"
+      ]
+    },
+    {
+      "chart": "Stephen Hawking",
+      "rule_id": "kahala_yoga",
+      "rule_name": "Kahala Yoga",
+      "pyjhora_names": [
+        "kaahala_yoga"
+      ]
+    },
+    {
+      "chart": "Charles Darwin",
+      "rule_id": "bvr_sumukha_precise",
+      "rule_name": "Sumukha Yoga",
+      "pyjhora_names": [
+        "sumukha_yoga"
+      ]
+    },
+    {
+      "chart": "Charles Darwin",
+      "rule_id": "bvr_matrunasa_precise",
+      "rule_name": "Matrunasa Yoga",
+      "pyjhora_names": [
+        "matrunasa_yoga_198",
+        "matrunasa_yoga_199"
+      ]
+    },
+    {
+      "chart": "Charles Darwin",
+      "rule_id": "bvr_eka_puthra_precise",
+      "rule_name": "Eka Puthra Yoga",
+      "pyjhora_names": [
+        "eka_puthra_yoga"
       ]
     },
     {
@@ -1223,14 +1070,6 @@
         "kalanidhi_yoga"
       ]
     },
-    {
-      "chart": "Charles Darwin",
-      "rule_id": "bvr_sumukha_precise",
-      "rule_name": "Sumukha Yoga",
-      "pyjhora_names": [
-        "sumukha_yoga"
-      ]
-    },
     {
       "chart": "Charles Darwin",
       "rule_id": "bvr_utthama_graha_yoga",
@@ -1239,6 +1078,15 @@
         "utthama_graha_yoga"
       ]
     },
+    {
+      "chart": "Charles Darwin",
+      "rule_id": "bvr_krisanga_yoga",
+      "rule_name": "Krisanga Yoga",
+      "pyjhora_names": [
+        "krisanga_yoga_112",
+        "krisanga_yoga_113"
+      ]
+    },
     {
       "chart": "Charles Darwin",
       "rule_id": "bvr_matru_sneha_yoga",
@@ -1247,14 +1095,6 @@
         "matru_sneha_yoga"
       ]
     },
-    {
-      "chart": "Charles Darwin",
-      "rule_id": "bvr_eka_puthra_precise",
-      "rule_name": "Eka Puthra Yoga",
-      "pyjhora_names": [
-        "eka_puthra_yoga"
-      ]
-    },
     {
       "chart": "Charles Darwin",
       "rule_id": "bvr_swaveeryaddhana_precise",
@@ -1265,29 +1105,27 @@
     },
     {
       "chart": "Charles Darwin",
-      "rule_id": "bvr_matrunasa_precise",
-      "rule_name": "Matrunasa Yoga",
+      "rule_id": "bvr_kaalanirdesat_puthranaasa_yoga",
+      "rule_name": "Kaalanirdesat Puthranaasa Yoga",
       "pyjhora_names": [
-        "matrunasa_yoga_198",
-        "matrunasa_yoga_199"
+        "kaalanirdesat_puthranaasa_yoga_230",
+        "kaalanirdesat_puthranaasa_yoga_229"
       ]
     },
     {
       "chart": "Thomas Edison",
-      "rule_id": "bvr_dehasthoulya_yoga",
-      "rule_name": "Dehasthoulya Yoga",
+      "rule_id": "bvr_bandhubhisthyaktha_precise",
+      "rule_name": "Bandhubhisthyaktha Yoga",
       "pyjhora_names": [
-        "dehasthoulya_yoga_114",
-        "dehasthoulya_yoga_115",
-        "dehasthoulya_yoga_116"
+        "bandhubhisthyaktha_yoga"
       ]
     },
     {
       "chart": "Thomas Edison",
-      "rule_id": "kahala_yoga",
-      "rule_name": "Kahala Yoga",
+      "rule_id": "bvr_swaveeryaddhana_precise",
+      "rule_name": "Swaveeryaddhana Yoga",
       "pyjhora_names": [
-        "kaahala_yoga"
+        "swaveeryaddhana_yoga"
       ]
     },
     {
@@ -1298,14 +1136,6 @@
         "brahma_yoga"
       ]
     },
-    {
-      "chart": "Thomas Edison",
-      "rule_id": "bvr_bandhubhisthyaktha_precise",
-      "rule_name": "Bandhubhisthyaktha Yoga",
-      "pyjhora_names": [
-        "bandhubhisthyaktha_yoga"
-      ]
-    },
     {
       "chart": "Thomas Edison",
       "rule_id": "bheri_yoga",
@@ -1314,6 +1144,16 @@
         "bheri_yoga"
       ]
     },
+    {
+      "chart": "Thomas Edison",
+      "rule_id": "bvr_dehasthoulya_yoga",
+      "rule_name": "Dehasthoulya Yoga",
+      "pyjhora_names": [
+        "dehasthoulya_yoga_114",
+        "dehasthoulya_yoga_115",
+        "dehasthoulya_yoga_116"
+      ]
+    },
     {
       "chart": "Thomas Edison",
       "rule_id": "bvr_matru_sneha_yoga",
@@ -1324,18 +1164,18 @@
     },
     {
       "chart": "Thomas Edison",
-      "rule_id": "bvr_swaveeryaddhana_precise",
-      "rule_name": "Swaveeryaddhana Yoga",
+      "rule_id": "kahala_yoga",
+      "rule_name": "Kahala Yoga",
       "pyjhora_names": [
-        "swaveeryaddhana_yoga"
+        "kaahala_yoga"
       ]
     },
     {
       "chart": "Alexander Fleming",
-      "rule_id": "bvr_utthama_graha_yoga",
-      "rule_name": "Utthama Griha Yoga",
+      "rule_id": "bvr_sada_sanchara_precise",
+      "rule_name": "Sada Sanchara Yoga",
       "pyjhora_names": [
-        "utthama_graha_yoga"
+        "sada_sanchara_yoga"
       ]
     },
     {
@@ -1349,10 +1189,26 @@
     },
     {
       "chart": "Alexander Fleming",
-      "rule_id": "bvr_sada_sanchara_precise",
-      "rule_name": "Sada Sanchara Yoga",
+      "rule_id": "bvr_utthama_graha_yoga",
+      "rule_name": "Utthama Griha Yoga",
       "pyjhora_names": [
-        "sada_sanchara_yoga"
+        "utthama_graha_yoga"
+      ]
+    },
+    {
+      "chart": "Max Planck",
+      "rule_id": "bvr_amala_precise",
+      "rule_name": "Amala Yoga",
+      "pyjhora_names": [
+        "amala_yoga"
+      ]
+    },
+    {
+      "chart": "Max Planck",
+      "rule_id": "bvr_rogagrastha_precise",
+      "rule_name": "Rogagrastha Yoga",
+      "pyjhora_names": [
+        "rogagrastha_yoga"
       ]
     },
     {
@@ -1365,10 +1221,22 @@
     },
     {
       "chart": "Max Planck",
-      "rule_id": "bvr_rogagrastha_precise",
-      "rule_name": "Rogagrastha Yoga",
+      "rule_id": "bvr_nishkapata_precise",
+      "rule_name": "Nishkapata Yoga",
       "pyjhora_names": [
-        "rogagrastha_yoga"
+        "nishkapata_yoga_205",
+        "nishkapata_yoga_206",
+        "kapata_yoga_202",
+        "kapata_yoga_204"
+      ]
+    },
+    {
+      "chart": "Max Planck",
+      "rule_id": "bvr_ayatna_griha_prapta_yoga",
+      "rule_name": "Ayatna Griha Prapta Yoga",
+      "pyjhora_names": [
+        "ayatna_griha_prapta_yoga_189",
+        "ayatna_griha_prapta_yoga_190"
       ]
     },
     {
@@ -1409,7 +1277,15 @@
       ]
     },
     {
-      "chart": "Max Planck",
+      "chart": "Niels Bohr",
+      "rule_id": "bvr_bandhubhisthyaktha_precise",
+      "rule_name": "Bandhubhisthyaktha Yoga",
+      "pyjhora_names": [
+        "bandhubhisthyaktha_yoga"
+      ]
+    },
+    {
+      "chart": "Niels Bohr",
       "rule_id": "bvr_nishkapata_precise",
       "rule_name": "Nishkapata Yoga",
       "pyjhora_names": [
@@ -1419,23 +1295,6 @@
         "kapata_yoga_204"
       ]
     },
-    {
-      "chart": "Max Planck",
-      "rule_id": "bvr_amala_precise",
-      "rule_name": "Amala Yoga",
-      "pyjhora_names": [
-        "amala_yoga"
-      ]
-    },
-    {
-      "chart": "Max Planck",
-      "rule_id": "bvr_ayatna_griha_prapta_yoga",
-      "rule_name": "Ayatna Griha Prapta Yoga",
-      "pyjhora_names": [
-        "ayatna_griha_prapta_yoga_189",
-        "ayatna_griha_prapta_yoga_190"
-      ]
-    },
     {
       "chart": "Niels Bohr",
       "rule_id": "bvr_dehasthoulya_yoga",
@@ -1446,14 +1305,6 @@
         "dehasthoulya_yoga_116"
       ]
     },
-    {
-      "chart": "Niels Bohr",
-      "rule_id": "kahala_yoga",
-      "rule_name": "Kahala Yoga",
-      "pyjhora_names": [
-        "kaahala_yoga"
-      ]
-    },
     {
       "chart": "Niels Bohr",
       "rule_id": "bvr_kaalanirdesat_puthranaasa_yoga",
@@ -1465,10 +1316,10 @@
     },
     {
       "chart": "Niels Bohr",
-      "rule_id": "bvr_bandhubhisthyaktha_precise",
-      "rule_name": "Bandhubhisthyaktha Yoga",
+      "rule_id": "kahala_yoga",
+      "rule_name": "Kahala Yoga",
       "pyjhora_names": [
-        "bandhubhisthyaktha_yoga"
+        "kaahala_yoga"
       ]
     },
     {
@@ -1483,23 +1334,12 @@
         "mathibhramana_yoga_variation"
       ]
     },
-    {
-      "chart": "Niels Bohr",
-      "rule_id": "bvr_nishkapata_precise",
-      "rule_name": "Nishkapata Yoga",
-      "pyjhora_names": [
-        "nishkapata_yoga_205",
-        "nishkapata_yoga_206",
-        "kapata_yoga_202",
-        "kapata_yoga_204"
-      ]
-    },
     {
       "chart": "Richard Feynman",
-      "rule_id": "kahala_yoga",
-      "rule_name": "Kahala Yoga",
+      "rule_id": "bvr_sumukha_precise",
+      "rule_name": "Sumukha Yoga",
       "pyjhora_names": [
-        "kaahala_yoga"
+        "sumukha_yoga"
       ]
     },
     {
@@ -1511,14 +1351,6 @@
         "ayatna_griha_prapta_yoga_190"
       ]
     },
-    {
-      "chart": "Richard Feynman",
-      "rule_id": "bvr_sumukha_precise",
-      "rule_name": "Sumukha Yoga",
-      "pyjhora_names": [
-        "sumukha_yoga"
-      ]
-    },
     {
       "chart": "Richard Feynman",
       "rule_id": "bvr_rogagrastha_precise",
@@ -1528,7 +1360,7 @@
       ]
     },
     {
-      "chart": "Mahatma Gandhi",
+      "chart": "Richard Feynman",
       "rule_id": "kahala_yoga",
       "rule_name": "Kahala Yoga",
       "pyjhora_names": [
@@ -1537,23 +1369,11 @@
     },
     {
       "chart": "Mahatma Gandhi",
-      "rule_id": "bvr_kaalanirdesat_puthranaasa_yoga",
-      "rule_name": "Kaalanirdesat Puthranaasa Yoga",
+      "rule_id": "bvr_dattha_puthra_yoga",
+      "rule_name": "Dattha Puthra Yoga",
       "pyjhora_names": [
-        "kaalanirdesat_puthranaasa_yoga_230",
-        "kaalanirdesat_puthranaasa_yoga_229"
-      ]
-    },
-    {
-      "chart": "Mahatma Gandhi",
-      "rule_id": "bvr_mathibhramana_yoga",
-      "rule_name": "Mathibhramana Yoga",
-      "pyjhora_names": [
-        "mathibhramana_yoga_291",
-        "mathibhramana_yoga_292",
-        "mathibhramana_yoga_293",
-        "mathibhramana_yoga_294",
-        "mathibhramana_yoga_variation"
+        "dattha_puthra_yoga_222",
+        "dattha_puthra_yoga_223"
       ]
     },
     {
@@ -1569,11 +1389,39 @@
     },
     {
       "chart": "Mahatma Gandhi",
-      "rule_id": "bvr_dattha_puthra_yoga",
-      "rule_name": "Dattha Puthra Yoga",
+      "rule_id": "kahala_yoga",
+      "rule_name": "Kahala Yoga",
       "pyjhora_names": [
-        "dattha_puthra_yoga_222",
-        "dattha_puthra_yoga_223"
+        "kaahala_yoga"
+      ]
+    },
+    {
+      "chart": "Mahatma Gandhi",
+      "rule_id": "bvr_mathibhramana_yoga",
+      "rule_name": "Mathibhramana Yoga",
+      "pyjhora_names": [
+        "mathibhramana_yoga_291",
+        "mathibhramana_yoga_292",
+        "mathibhramana_yoga_293",
+        "mathibhramana_yoga_294",
+        "mathibhramana_yoga_variation"
+      ]
+    },
+    {
+      "chart": "Jawaharlal Nehru",
+      "rule_id": "bvr_vanchana_chora_bheethi_yoga",
+      "rule_name": "Vanchana Chora Bheethi Yoga",
+      "pyjhora_names": [
+        "vanchana_chora_bheethi_yoga"
+      ]
+    },
+    {
+      "chart": "Jawaharlal Nehru",
+      "rule_id": "bvr_matrunasa_precise",
+      "rule_name": "Matrunasa Yoga",
+      "pyjhora_names": [
+        "matrunasa_yoga_198",
+        "matrunasa_yoga_199"
       ]
     },
     {
@@ -1585,14 +1433,6 @@
         "kaalanirdesat_puthranaasa_yoga_229"
       ]
     },
-    {
-      "chart": "Jawaharlal Nehru",
-      "rule_id": "bvr_vanchana_chora_bheethi_yoga",
-      "rule_name": "Vanchana Chora Bheethi Yoga",
-      "pyjhora_names": [
-        "vanchana_chora_bheethi_yoga"
-      ]
-    },
     {
       "chart": "Jawaharlal Nehru",
       "rule_id": "bvr_matrudeerghayur_yoga",
@@ -1602,23 +1442,6 @@
         "matrudeerghayur_yoga_197"
       ]
     },
-    {
-      "chart": "Jawaharlal Nehru",
-      "rule_id": "sankha_yoga",
-      "rule_name": "Sankha Yoga",
-      "pyjhora_names": [
-        "sankha_yoga"
-      ]
-    },
-    {
-      "chart": "Jawaharlal Nehru",
-      "rule_id": "bvr_matrunasa_precise",
-      "rule_name": "Matrunasa Yoga",
-      "pyjhora_names": [
-        "matrunasa_yoga_198",
-        "matrunasa_yoga_199"
-      ]
-    },
     {
       "chart": "Narendra Modi",
       "rule_id": "bvr_amala_precise",
@@ -1627,15 +1450,6 @@
         "amala_yoga"
       ]
     },
-    {
-      "chart": "Narendra Modi",
-      "rule_id": "bvr_bahu_puthra_precise",
-      "rule_name": "Bahu Puthra Yoga",
-      "pyjhora_names": [
-        "bahu_puthra_yoga_220",
-        "bahu_puthra_yoga_221"
-      ]
-    },
     {
       "chart": "Narendra Modi",
       "rule_id": "bvr_swaveeryaddhana_precise",
@@ -1645,7 +1459,7 @@
       ]
     },
     {
-      "chart": "Indira Gandhi",
+      "chart": "Narendra Modi",
       "rule_id": "bvr_bahu_puthra_precise",
       "rule_name": "Bahu Puthra Yoga",
       "pyjhora_names": [
@@ -1654,7 +1468,7 @@
       ]
     },
     {
-      "chart": "Indira Gandhi",
+      "chart": "Narendra Modi",
       "rule_id": "bvr_kaalanirdesat_puthranaasa_yoga",
       "rule_name": "Kaalanirdesat Puthranaasa Yoga",
       "pyjhora_names": [
@@ -1662,6 +1476,15 @@
         "kaalanirdesat_puthranaasa_yoga_229"
       ]
     },
+    {
+      "chart": "Indira Gandhi",
+      "rule_id": "bvr_ayatna_griha_prapta_yoga",
+      "rule_name": "Ayatna Griha Prapta Yoga",
+      "pyjhora_names": [
+        "ayatna_griha_prapta_yoga_189",
+        "ayatna_griha_prapta_yoga_190"
+      ]
+    },
     {
       "chart": "Indira Gandhi",
       "rule_id": "bvr_krisanga_yoga",
@@ -1671,6 +1494,15 @@
         "krisanga_yoga_113"
       ]
     },
+    {
+      "chart": "Indira Gandhi",
+      "rule_id": "bvr_bahu_puthra_precise",
+      "rule_name": "Bahu Puthra Yoga",
+      "pyjhora_names": [
+        "bahu_puthra_yoga_220",
+        "bahu_puthra_yoga_221"
+      ]
+    },
     {
       "chart": "Indira Gandhi",
       "rule_id": "bvr_utthama_graha_yoga",
@@ -1679,21 +1511,13 @@
         "utthama_graha_yoga"
       ]
     },
-    {
-      "chart": "Indira Gandhi",
-      "rule_id": "bvr_ayatna_griha_prapta_yoga",
-      "rule_name": "Ayatna Griha Prapta Yoga",
-      "pyjhora_names": [
-        "ayatna_griha_prapta_yoga_189",
-        "ayatna_griha_prapta_yoga_190"
-      ]
-    },
     {
       "chart": "Winston Churchill",
-      "rule_id": "bvr_sada_sanchara_precise",
-      "rule_name": "Sada Sanchara Yoga",
+      "rule_id": "bvr_matrunasa_precise",
+      "rule_name": "Matrunasa Yoga",
       "pyjhora_names": [
-        "sada_sanchara_yoga"
+        "matrunasa_yoga_198",
+        "matrunasa_yoga_199"
       ]
     },
     {
@@ -1704,6 +1528,15 @@
         "vanchana_chora_bheethi_yoga"
       ]
     },
+    {
+      "chart": "Winston Churchill",
+      "rule_id": "bvr_bandhu_pujya_yoga",
+      "rule_name": "Bandhu Pujya Yoga",
+      "pyjhora_names": [
+        "bandhu_pujya_yoga_193",
+        "bandhu_pujya_yoga_194"
+      ]
+    },
     {
       "chart": "Winston Churchill",
       "rule_id": "bvr_dharidhra_11_precise",
@@ -1720,62 +1553,10 @@
     },
     {
       "chart": "Winston Churchill",
-      "rule_id": "bvr_bandhu_pujya_yoga",
-      "rule_name": "Bandhu Pujya Yoga",
+      "rule_id": "bvr_sada_sanchara_precise",
+      "rule_name": "Sada Sanchara Yoga",
       "pyjhora_names": [
-        "bandhu_pujya_yoga_193",
-        "bandhu_pujya_yoga_194"
-      ]
-    },
-    {
-      "chart": "Winston Churchill",
-      "rule_id": "sankha_yoga",
-      "rule_name": "Sankha Yoga",
-      "pyjhora_names": [
-        "sankha_yoga"
-      ]
-    },
-    {
-      "chart": "Winston Churchill",
-      "rule_id": "bvr_matrunasa_precise",
-      "rule_name": "Matrunasa Yoga",
-      "pyjhora_names": [
-        "matrunasa_yoga_198",
-        "matrunasa_yoga_199"
-      ]
-    },
-    {
-      "chart": "John F. Kennedy",
-      "rule_id": "bvr_rogagrastha_precise",
-      "rule_name": "Rogagrastha Yoga",
-      "pyjhora_names": [
-        "rogagrastha_yoga"
-      ]
-    },
-    {
-      "chart": "John F. Kennedy",
-      "rule_id": "bvr_krisanga_yoga",
-      "rule_name": "Krisanga Yoga",
-      "pyjhora_names": [
-        "krisanga_yoga_112",
-        "krisanga_yoga_113"
-      ]
-    },
-    {
-      "chart": "John F. Kennedy",
-      "rule_id": "bvr_bandhu_pujya_yoga",
-      "rule_name": "Bandhu Pujya Yoga",
-      "pyjhora_names": [
-        "bandhu_pujya_yoga_193",
-        "bandhu_pujya_yoga_194"
-      ]
-    },
-    {
-      "chart": "John F. Kennedy",
-      "rule_id": "bvr_bhaga_chumbana_yoga",
-      "rule_name": "Bhaga Chumbana Yoga",
-      "pyjhora_names": [
-        "bhaga_chumbana_yoga"
+        "sada_sanchara_yoga"
       ]
     },
     {
@@ -1786,6 +1567,14 @@
         "amala_yoga"
       ]
     },
+    {
+      "chart": "John F. Kennedy",
+      "rule_id": "bvr_rogagrastha_precise",
+      "rule_name": "Rogagrastha Yoga",
+      "pyjhora_names": [
+        "rogagrastha_yoga"
+      ]
+    },
     {
       "chart": "John F. Kennedy",
       "rule_id": "bvr_matrunasa_precise",
@@ -1795,6 +1584,66 @@
         "matrunasa_yoga_199"
       ]
     },
+    {
+      "chart": "John F. Kennedy",
+      "rule_id": "bvr_bhaga_chumbana_yoga",
+      "rule_name": "Bhaga Chumbana Yoga",
+      "pyjhora_names": [
+        "bhaga_chumbana_yoga"
+      ]
+    },
+    {
+      "chart": "John F. Kennedy",
+      "rule_id": "bvr_bandhu_pujya_yoga",
+      "rule_name": "Bandhu Pujya Yoga",
+      "pyjhora_names": [
+        "bandhu_pujya_yoga_193",
+        "bandhu_pujya_yoga_194"
+      ]
+    },
+    {
+      "chart": "John F. Kennedy",
+      "rule_id": "bvr_krisanga_yoga",
+      "rule_name": "Krisanga Yoga",
+      "pyjhora_names": [
+        "krisanga_yoga_112",
+        "krisanga_yoga_113"
+      ]
+    },
+    {
+      "chart": "Nelson Mandela",
+      "rule_id": "bvr_sumukha_precise",
+      "rule_name": "Sumukha Yoga",
+      "pyjhora_names": [
+        "sumukha_yoga"
+      ]
+    },
+    {
+      "chart": "Nelson Mandela",
+      "rule_id": "bvr_rogagrastha_precise",
+      "rule_name": "Rogagrastha Yoga",
+      "pyjhora_names": [
+        "rogagrastha_yoga"
+      ]
+    },
+    {
+      "chart": "Nelson Mandela",
+      "rule_id": "bvr_matrunasa_precise",
+      "rule_name": "Matrunasa Yoga",
+      "pyjhora_names": [
+        "matrunasa_yoga_198",
+        "matrunasa_yoga_199"
+      ]
+    },
+    {
+      "chart": "Nelson Mandela",
+      "rule_id": "bvr_bandhu_pujya_yoga",
+      "rule_name": "Bandhu Pujya Yoga",
+      "pyjhora_names": [
+        "bandhu_pujya_yoga_193",
+        "bandhu_pujya_yoga_194"
+      ]
+    },
     {
       "chart": "Nelson Mandela",
       "rule_id": "bvr_bahu_puthra_precise",
@@ -1814,39 +1663,13 @@
       ]
     },
     {
-      "chart": "Nelson Mandela",
-      "rule_id": "bvr_rogagrastha_precise",
-      "rule_name": "Rogagrastha Yoga",
-      "pyjhora_names": [
-        "rogagrastha_yoga"
-      ]
-    },
-    {
-      "chart": "Nelson Mandela",
+      "chart": "Abraham Lincoln",
       "rule_id": "bvr_sumukha_precise",
       "rule_name": "Sumukha Yoga",
       "pyjhora_names": [
         "sumukha_yoga"
       ]
     },
-    {
-      "chart": "Nelson Mandela",
-      "rule_id": "bvr_bandhu_pujya_yoga",
-      "rule_name": "Bandhu Pujya Yoga",
-      "pyjhora_names": [
-        "bandhu_pujya_yoga_193",
-        "bandhu_pujya_yoga_194"
-      ]
-    },
-    {
-      "chart": "Nelson Mandela",
-      "rule_id": "bvr_matrunasa_precise",
-      "rule_name": "Matrunasa Yoga",
-      "pyjhora_names": [
-        "matrunasa_yoga_198",
-        "matrunasa_yoga_199"
-      ]
-    },
     {
       "chart": "Abraham Lincoln",
       "rule_id": "bvr_kalaanidhi_yoga",
@@ -1856,14 +1679,6 @@
         "kalanidhi_yoga"
       ]
     },
-    {
-      "chart": "Abraham Lincoln",
-      "rule_id": "bvr_sumukha_precise",
-      "rule_name": "Sumukha Yoga",
-      "pyjhora_names": [
-        "sumukha_yoga"
-      ]
-    },
     {
       "chart": "Abraham Lincoln",
       "rule_id": "bvr_utthama_graha_yoga",
@@ -1872,6 +1687,14 @@
         "utthama_graha_yoga"
       ]
     },
+    {
+      "chart": "Abraham Lincoln",
+      "rule_id": "bvr_eka_puthra_precise",
+      "rule_name": "Eka Puthra Yoga",
+      "pyjhora_names": [
+        "eka_puthra_yoga"
+      ]
+    },
     {
       "chart": "Abraham Lincoln",
       "rule_id": "bvr_matru_sneha_yoga",
@@ -1882,10 +1705,36 @@
     },
     {
       "chart": "Abraham Lincoln",
-      "rule_id": "bvr_eka_puthra_precise",
-      "rule_name": "Eka Puthra Yoga",
+      "rule_id": "bvr_kaalanirdesat_puthranaasa_yoga",
+      "rule_name": "Kaalanirdesat Puthranaasa Yoga",
       "pyjhora_names": [
-        "eka_puthra_yoga"
+        "kaalanirdesat_puthranaasa_yoga_230",
+        "kaalanirdesat_puthranaasa_yoga_229"
+      ]
+    },
+    {
+      "chart": "Margaret Thatcher",
+      "rule_id": "bvr_bandhubhisthyaktha_precise",
+      "rule_name": "Bandhubhisthyaktha Yoga",
+      "pyjhora_names": [
+        "bandhubhisthyaktha_yoga"
+      ]
+    },
+    {
+      "chart": "Margaret Thatcher",
+      "rule_id": "bvr_matrunasa_precise",
+      "rule_name": "Matrunasa Yoga",
+      "pyjhora_names": [
+        "matrunasa_yoga_198",
+        "matrunasa_yoga_199"
+      ]
+    },
+    {
+      "chart": "Margaret Thatcher",
+      "rule_id": "sankha_yoga",
+      "rule_name": "Sankha Yoga",
+      "pyjhora_names": [
+        "sankha_yoga"
       ]
     },
     {
@@ -1898,6 +1747,14 @@
         "dehasthoulya_yoga_116"
       ]
     },
+    {
+      "chart": "Margaret Thatcher",
+      "rule_id": "bvr_swaveeryaddhana_precise",
+      "rule_name": "Swaveeryaddhana Yoga",
+      "pyjhora_names": [
+        "swaveeryaddhana_yoga"
+      ]
+    },
     {
       "chart": "Margaret Thatcher",
       "rule_id": "bvr_mathibhramana_yoga",
@@ -1910,64 +1767,6 @@
         "mathibhramana_yoga_variation"
       ]
     },
-    {
-      "chart": "Margaret Thatcher",
-      "rule_id": "bvr_bandhubhisthyaktha_precise",
-      "rule_name": "Bandhubhisthyaktha Yoga",
-      "pyjhora_names": [
-        "bandhubhisthyaktha_yoga"
-      ]
-    },
-    {
-      "chart": "Margaret Thatcher",
-      "rule_id": "bvr_swaveeryaddhana_precise",
-      "rule_name": "Swaveeryaddhana Yoga",
-      "pyjhora_names": [
-        "swaveeryaddhana_yoga"
-      ]
-    },
-    {
-      "chart": "Margaret Thatcher",
-      "rule_id": "sankha_yoga",
-      "rule_name": "Sankha Yoga",
-      "pyjhora_names": [
-        "sankha_yoga"
-      ]
-    },
-    {
-      "chart": "Margaret Thatcher",
-      "rule_id": "bvr_matrunasa_precise",
-      "rule_name": "Matrunasa Yoga",
-      "pyjhora_names": [
-        "matrunasa_yoga_198",
-        "matrunasa_yoga_199"
-      ]
-    },
-    {
-      "chart": "Barack Obama",
-      "rule_id": "bvr_bandhubhisthyaktha_precise",
-      "rule_name": "Bandhubhisthyaktha Yoga",
-      "pyjhora_names": [
-        "bandhubhisthyaktha_yoga"
-      ]
-    },
-    {
-      "chart": "Barack Obama",
-      "rule_id": "bvr_matrunasa_precise",
-      "rule_name": "Matrunasa Yoga",
-      "pyjhora_names": [
-        "matrunasa_yoga_198",
-        "matrunasa_yoga_199"
-      ]
-    },
-    {
-      "chart": "Barack Obama",
-      "rule_id": "bvr_swaveeryaddhana_precise",
-      "rule_name": "Swaveeryaddhana Yoga",
-      "pyjhora_names": [
-        "swaveeryaddhana_yoga"
-      ]
-    },
     {
       "chart": "Barack Obama",
       "rule_id": "bvr_amala_precise",
@@ -1976,6 +1775,23 @@
         "amala_yoga"
       ]
     },
+    {
+      "chart": "Barack Obama",
+      "rule_id": "bvr_bandhubhisthyaktha_precise",
+      "rule_name": "Bandhubhisthyaktha Yoga",
+      "pyjhora_names": [
+        "bandhubhisthyaktha_yoga"
+      ]
+    },
+    {
+      "chart": "Barack Obama",
+      "rule_id": "bvr_matrunasa_precise",
+      "rule_name": "Matrunasa Yoga",
+      "pyjhora_names": [
+        "matrunasa_yoga_198",
+        "matrunasa_yoga_199"
+      ]
+    },
     {
       "chart": "Barack Obama",
       "rule_id": "bvr_dharidhra_11_precise",
@@ -1991,7 +1807,15 @@
       ]
     },
     {
-      "chart": "Rabindranath Tagore",
+      "chart": "Barack Obama",
+      "rule_id": "bvr_swaveeryaddhana_precise",
+      "rule_name": "Swaveeryaddhana Yoga",
+      "pyjhora_names": [
+        "swaveeryaddhana_yoga"
+      ]
+    },
+    {
+      "chart": "Barack Obama",
       "rule_id": "bvr_kaalanirdesat_puthranaasa_yoga",
       "rule_name": "Kaalanirdesat Puthranaasa Yoga",
       "pyjhora_names": [
@@ -1999,22 +1823,6 @@
         "kaalanirdesat_puthranaasa_yoga_229"
       ]
     },
-    {
-      "chart": "Rabindranath Tagore",
-      "rule_id": "bvr_rogagrastha_precise",
-      "rule_name": "Rogagrastha Yoga",
-      "pyjhora_names": [
-        "rogagrastha_yoga"
-      ]
-    },
-    {
-      "chart": "Rabindranath Tagore",
-      "rule_id": "bvr_sada_sanchara_precise",
-      "rule_name": "Sada Sanchara Yoga",
-      "pyjhora_names": [
-        "sada_sanchara_yoga"
-      ]
-    },
     {
       "chart": "Rabindranath Tagore",
       "rule_id": "bvr_matrunasa_precise",
@@ -2025,49 +1833,19 @@
       ]
     },
     {
-      "chart": "Ludwig van Beethoven",
-      "rule_id": "bvr_kaalanirdesat_puthranaasa_yoga",
-      "rule_name": "Kaalanirdesat Puthranaasa Yoga",
+      "chart": "Rabindranath Tagore",
+      "rule_id": "bvr_sada_sanchara_precise",
+      "rule_name": "Sada Sanchara Yoga",
       "pyjhora_names": [
-        "kaalanirdesat_puthranaasa_yoga_230",
-        "kaalanirdesat_puthranaasa_yoga_229"
+        "sada_sanchara_yoga"
       ]
     },
     {
-      "chart": "Ludwig van Beethoven",
-      "rule_id": "bvr_vanchana_chora_bheethi_yoga",
-      "rule_name": "Vanchana Chora Bheethi Yoga",
+      "chart": "Rabindranath Tagore",
+      "rule_id": "bvr_rogagrastha_precise",
+      "rule_name": "Rogagrastha Yoga",
       "pyjhora_names": [
-        "vanchana_chora_bheethi_yoga"
-      ]
-    },
-    {
-      "chart": "Ludwig van Beethoven",
-      "rule_id": "bvr_kalaanidhi_yoga",
-      "rule_name": "Kalaanidhi Yoga",
-      "pyjhora_names": [
-        "kalaanidhi_yoga",
-        "kalanidhi_yoga"
-      ]
-    },
-    {
-      "chart": "Ludwig van Beethoven",
-      "rule_id": "bvr_matru_sneha_yoga",
-      "rule_name": "Matru Sneha Yoga",
-      "pyjhora_names": [
-        "matru_sneha_yoga"
-      ]
-    },
-    {
-      "chart": "Ludwig van Beethoven",
-      "rule_id": "bvr_mathibhramana_yoga",
-      "rule_name": "Mathibhramana Yoga",
-      "pyjhora_names": [
-        "mathibhramana_yoga_291",
-        "mathibhramana_yoga_292",
-        "mathibhramana_yoga_293",
-        "mathibhramana_yoga_294",
-        "mathibhramana_yoga_variation"
+        "rogagrastha_yoga"
       ]
     },
     {
@@ -2081,6 +1859,51 @@
         "kapata_yoga_204"
       ]
     },
+    {
+      "chart": "Ludwig van Beethoven",
+      "rule_id": "bvr_vanchana_chora_bheethi_yoga",
+      "rule_name": "Vanchana Chora Bheethi Yoga",
+      "pyjhora_names": [
+        "vanchana_chora_bheethi_yoga"
+      ]
+    },
+    {
+      "chart": "Ludwig van Beethoven",
+      "rule_id": "bvr_kalaanidhi_yoga",
+      "rule_name": "Kalaanidhi Yoga",
+      "pyjhora_names": [
+        "kalaanidhi_yoga",
+        "kalanidhi_yoga"
+      ]
+    },
+    {
+      "chart": "Ludwig van Beethoven",
+      "rule_id": "bvr_matru_sneha_yoga",
+      "rule_name": "Matru Sneha Yoga",
+      "pyjhora_names": [
+        "matru_sneha_yoga"
+      ]
+    },
+    {
+      "chart": "Ludwig van Beethoven",
+      "rule_id": "bvr_mathibhramana_yoga",
+      "rule_name": "Mathibhramana Yoga",
+      "pyjhora_names": [
+        "mathibhramana_yoga_291",
+        "mathibhramana_yoga_292",
+        "mathibhramana_yoga_293",
+        "mathibhramana_yoga_294",
+        "mathibhramana_yoga_variation"
+      ]
+    },
+    {
+      "chart": "Wolfgang Mozart",
+      "rule_id": "bvr_yukthi_samanwithavagmi_yoga",
+      "rule_name": "Yukthi Samanwithavagmi Yoga",
+      "pyjhora_names": [
+        "yukthi_samanwithavagmi_yoga_154"
+      ]
+    },
     {
       "chart": "Wolfgang Mozart",
       "rule_id": "bvr_bhratruvriddhi_precise",
@@ -2091,29 +1914,11 @@
     },
     {
       "chart": "Wolfgang Mozart",
-      "rule_id": "bvr_dehasthoulya_yoga",
-      "rule_name": "Dehasthoulya Yoga",
+      "rule_id": "bvr_matrunasa_precise",
+      "rule_name": "Matrunasa Yoga",
       "pyjhora_names": [
-        "dehasthoulya_yoga_114",
-        "dehasthoulya_yoga_115",
-        "dehasthoulya_yoga_116"
-      ]
-    },
-    {
-      "chart": "Wolfgang Mozart",
-      "rule_id": "bvr_sada_sanchara_precise",
-      "rule_name": "Sada Sanchara Yoga",
-      "pyjhora_names": [
-        "sada_sanchara_yoga"
-      ]
-    },
-    {
-      "chart": "Wolfgang Mozart",
-      "rule_id": "bvr_krisanga_yoga",
-      "rule_name": "Krisanga Yoga",
-      "pyjhora_names": [
-        "krisanga_yoga_112",
-        "krisanga_yoga_113"
+        "matrunasa_yoga_198",
+        "matrunasa_yoga_199"
       ]
     },
     {
@@ -2132,28 +1937,56 @@
     },
     {
       "chart": "Wolfgang Mozart",
-      "rule_id": "bvr_yukthi_samanwithavagmi_yoga",
-      "rule_name": "Yukthi Samanwithavagmi Yoga",
+      "rule_id": "bvr_dehasthoulya_yoga",
+      "rule_name": "Dehasthoulya Yoga",
       "pyjhora_names": [
-        "yukthi_samanwithavagmi_yoga_154"
+        "dehasthoulya_yoga_114",
+        "dehasthoulya_yoga_115",
+        "dehasthoulya_yoga_116"
       ]
     },
     {
       "chart": "Wolfgang Mozart",
-      "rule_id": "bvr_matrunasa_precise",
-      "rule_name": "Matrunasa Yoga",
+      "rule_id": "bvr_krisanga_yoga",
+      "rule_name": "Krisanga Yoga",
       "pyjhora_names": [
-        "matrunasa_yoga_198",
-        "matrunasa_yoga_199"
+        "krisanga_yoga_112",
+        "krisanga_yoga_113"
+      ]
+    },
+    {
+      "chart": "Wolfgang Mozart",
+      "rule_id": "bvr_sada_sanchara_precise",
+      "rule_name": "Sada Sanchara Yoga",
+      "pyjhora_names": [
+        "sada_sanchara_yoga"
       ]
     },
     {
       "chart": "Pablo Picasso",
-      "rule_id": "bvr_bahu_puthra_precise",
-      "rule_name": "Bahu Puthra Yoga",
+      "rule_id": "bvr_sumukha_precise",
+      "rule_name": "Sumukha Yoga",
       "pyjhora_names": [
-        "bahu_puthra_yoga_220",
-        "bahu_puthra_yoga_221"
+        "sumukha_yoga"
+      ]
+    },
+    {
+      "chart": "Pablo Picasso",
+      "rule_id": "bvr_rogagrastha_precise",
+      "rule_name": "Rogagrastha Yoga",
+      "pyjhora_names": [
+        "rogagrastha_yoga"
+      ]
+    },
+    {
+      "chart": "Pablo Picasso",
+      "rule_id": "bvr_nishkapata_precise",
+      "rule_name": "Nishkapata Yoga",
+      "pyjhora_names": [
+        "nishkapata_yoga_205",
+        "nishkapata_yoga_206",
+        "kapata_yoga_202",
+        "kapata_yoga_204"
       ]
     },
     {
@@ -2165,14 +1998,6 @@
         "grihanasa_yoga_192"
       ]
     },
-    {
-      "chart": "Pablo Picasso",
-      "rule_id": "bvr_rogagrastha_precise",
-      "rule_name": "Rogagrastha Yoga",
-      "pyjhora_names": [
-        "rogagrastha_yoga"
-      ]
-    },
     {
       "chart": "Pablo Picasso",
       "rule_id": "bvr_dama_yoga",
@@ -2183,25 +2008,6 @@
     },
     {
       "chart": "Pablo Picasso",
-      "rule_id": "bvr_sumukha_precise",
-      "rule_name": "Sumukha Yoga",
-      "pyjhora_names": [
-        "sumukha_yoga"
-      ]
-    },
-    {
-      "chart": "Pablo Picasso",
-      "rule_id": "bvr_nishkapata_precise",
-      "rule_name": "Nishkapata Yoga",
-      "pyjhora_names": [
-        "nishkapata_yoga_205",
-        "nishkapata_yoga_206",
-        "kapata_yoga_202",
-        "kapata_yoga_204"
-      ]
-    },
-    {
-      "chart": "Vincent van Gogh",
       "rule_id": "bvr_bahu_puthra_precise",
       "rule_name": "Bahu Puthra Yoga",
       "pyjhora_names": [
@@ -2225,6 +2031,15 @@
         "yukthi_samanwithavagmi_yoga_154"
       ]
     },
+    {
+      "chart": "Vincent van Gogh",
+      "rule_id": "bvr_bahu_puthra_precise",
+      "rule_name": "Bahu Puthra Yoga",
+      "pyjhora_names": [
+        "bahu_puthra_yoga_220",
+        "bahu_puthra_yoga_221"
+      ]
+    },
     {
       "chart": "Vincent van Gogh",
       "rule_id": "bvr_mathibhramana_yoga",
@@ -2237,21 +2052,12 @@
         "mathibhramana_yoga_variation"
       ]
     },
-    {
-      "chart": "Vincent van Gogh",
-      "rule_id": "sankha_yoga",
-      "rule_name": "Sankha Yoga",
-      "pyjhora_names": [
-        "sankha_yoga"
-      ]
-    },
     {
       "chart": "Charlie Chaplin",
-      "rule_id": "bvr_bahu_puthra_precise",
-      "rule_name": "Bahu Puthra Yoga",
+      "rule_id": "bvr_yukthi_samanwithavagmi_yoga",
+      "rule_name": "Yukthi Samanwithavagmi Yoga",
       "pyjhora_names": [
-        "bahu_puthra_yoga_220",
-        "bahu_puthra_yoga_221"
+        "yukthi_samanwithavagmi_yoga_154"
       ]
     },
     {
@@ -2262,14 +2068,6 @@
         "pittharoga_yoga"
       ]
     },
-    {
-      "chart": "Charlie Chaplin",
-      "rule_id": "bvr_yukthi_samanwithavagmi_yoga",
-      "rule_name": "Yukthi Samanwithavagmi Yoga",
-      "pyjhora_names": [
-        "yukthi_samanwithavagmi_yoga_154"
-      ]
-    },
     {
       "chart": "Charlie Chaplin",
       "rule_id": "bvr_bandhu_pujya_yoga",
@@ -2279,6 +2077,15 @@
         "bandhu_pujya_yoga_194"
       ]
     },
+    {
+      "chart": "Charlie Chaplin",
+      "rule_id": "bvr_bahu_puthra_precise",
+      "rule_name": "Bahu Puthra Yoga",
+      "pyjhora_names": [
+        "bahu_puthra_yoga_220",
+        "bahu_puthra_yoga_221"
+      ]
+    },
     {
       "chart": "Charlie Chaplin",
       "rule_id": "bvr_mathibhramana_yoga",
@@ -2291,6 +2098,14 @@
         "mathibhramana_yoga_variation"
       ]
     },
+    {
+      "chart": "Elvis Presley",
+      "rule_id": "bvr_rogagrastha_precise",
+      "rule_name": "Rogagrastha Yoga",
+      "pyjhora_names": [
+        "rogagrastha_yoga"
+      ]
+    },
     {
       "chart": "Elvis Presley",
       "rule_id": "bvr_bhratruvriddhi_precise",
@@ -2308,14 +2123,6 @@
         "bahu_puthra_yoga_221"
       ]
     },
-    {
-      "chart": "Elvis Presley",
-      "rule_id": "bvr_rogagrastha_precise",
-      "rule_name": "Rogagrastha Yoga",
-      "pyjhora_names": [
-        "rogagrastha_yoga"
-      ]
-    },
     {
       "chart": "Elvis Presley",
       "rule_id": "bvr_sada_sanchara_precise",
@@ -2334,11 +2141,10 @@
     },
     {
       "chart": "Michael Jackson",
-      "rule_id": "bvr_bahu_puthra_precise",
-      "rule_name": "Bahu Puthra Yoga",
+      "rule_id": "bvr_sumukha_precise",
+      "rule_name": "Sumukha Yoga",
       "pyjhora_names": [
-        "bahu_puthra_yoga_220",
-        "bahu_puthra_yoga_221"
+        "sumukha_yoga"
       ]
     },
     {
@@ -2351,14 +2157,10 @@
     },
     {
       "chart": "Michael Jackson",
-      "rule_id": "bvr_mathibhramana_yoga",
-      "rule_name": "Mathibhramana Yoga",
+      "rule_id": "bvr_dama_yoga",
+      "rule_name": "Dama Yoga",
       "pyjhora_names": [
-        "mathibhramana_yoga_291",
-        "mathibhramana_yoga_292",
-        "mathibhramana_yoga_293",
-        "mathibhramana_yoga_294",
-        "mathibhramana_yoga_variation"
+        "dama_yoga"
       ]
     },
     {
@@ -2371,18 +2173,11 @@
     },
     {
       "chart": "Michael Jackson",
-      "rule_id": "bvr_dama_yoga",
-      "rule_name": "Dama Yoga",
+      "rule_id": "bvr_bahu_puthra_precise",
+      "rule_name": "Bahu Puthra Yoga",
       "pyjhora_names": [
-        "dama_yoga"
-      ]
-    },
-    {
-      "chart": "Michael Jackson",
-      "rule_id": "bvr_sumukha_precise",
-      "rule_name": "Sumukha Yoga",
-      "pyjhora_names": [
-        "sumukha_yoga"
+        "bahu_puthra_yoga_220",
+        "bahu_puthra_yoga_221"
       ]
     },
     {
@@ -2393,14 +2188,6 @@
         "swaveeryaddhana_yoga"
       ]
     },
-    {
-      "chart": "A.R. Rahman",
-      "rule_id": "bvr_dama_yoga",
-      "rule_name": "Dama Yoga",
-      "pyjhora_names": [
-        "dama_yoga"
-      ]
-    },
     {
       "chart": "A.R. Rahman",
       "rule_id": "bvr_rogagrastha_precise",
@@ -2418,21 +2205,20 @@
       ]
     },
     {
-      "chart": "Lata Mangeshkar",
-      "rule_id": "bvr_bahu_puthra_precise",
-      "rule_name": "Bahu Puthra Yoga",
+      "chart": "A.R. Rahman",
+      "rule_id": "bvr_dama_yoga",
+      "rule_name": "Dama Yoga",
       "pyjhora_names": [
-        "bahu_puthra_yoga_220",
-        "bahu_puthra_yoga_221"
+        "dama_yoga"
       ]
     },
     {
       "chart": "Lata Mangeshkar",
-      "rule_id": "bvr_kaalanirdesat_puthranaasa_yoga",
-      "rule_name": "Kaalanirdesat Puthranaasa Yoga",
+      "rule_id": "bvr_matrunasa_precise",
+      "rule_name": "Matrunasa Yoga",
       "pyjhora_names": [
-        "kaalanirdesat_puthranaasa_yoga_230",
-        "kaalanirdesat_puthranaasa_yoga_229"
+        "matrunasa_yoga_198",
+        "matrunasa_yoga_199"
       ]
     },
     {
@@ -2443,6 +2229,15 @@
         "dama_yoga"
       ]
     },
+    {
+      "chart": "Lata Mangeshkar",
+      "rule_id": "bvr_bahu_puthra_precise",
+      "rule_name": "Bahu Puthra Yoga",
+      "pyjhora_names": [
+        "bahu_puthra_yoga_220",
+        "bahu_puthra_yoga_221"
+      ]
+    },
     {
       "chart": "Lata Mangeshkar",
       "rule_id": "bvr_swaveeryaddhana_precise",
@@ -2463,41 +2258,6 @@
         "mathibhramana_yoga_variation"
       ]
     },
-    {
-      "chart": "Lata Mangeshkar",
-      "rule_id": "bvr_matrunasa_precise",
-      "rule_name": "Matrunasa Yoga",
-      "pyjhora_names": [
-        "matrunasa_yoga_198",
-        "matrunasa_yoga_199"
-      ]
-    },
-    {
-      "chart": "Steve Jobs",
-      "rule_id": "bvr_dehasthoulya_yoga",
-      "rule_name": "Dehasthoulya Yoga",
-      "pyjhora_names": [
-        "dehasthoulya_yoga_114",
-        "dehasthoulya_yoga_115",
-        "dehasthoulya_yoga_116"
-      ]
-    },
-    {
-      "chart": "Steve Jobs",
-      "rule_id": "bheri_yoga",
-      "rule_name": "Bheri Yoga",
-      "pyjhora_names": [
-        "bheri_yoga"
-      ]
-    },
-    {
-      "chart": "Steve Jobs",
-      "rule_id": "bvr_utthama_graha_yoga",
-      "rule_name": "Utthama Griha Yoga",
-      "pyjhora_names": [
-        "utthama_graha_yoga"
-      ]
-    },
     {
       "chart": "Steve Jobs",
       "rule_id": "bvr_yukthi_samanwithavagmi_yoga",
@@ -2524,29 +2284,45 @@
       ]
     },
     {
-      "chart": "Bill Gates",
-      "rule_id": "bvr_raja_bhanga_yoga",
-      "rule_name": "Raja Bhanga Yoga",
+      "chart": "Steve Jobs",
+      "rule_id": "sankha_yoga",
+      "rule_name": "Sankha Yoga",
       "pyjhora_names": [
-        "raja_bhanga_yoga_298",
-        "raja_bhanga_yoga_299"
+        "sankha_yoga"
+      ]
+    },
+    {
+      "chart": "Steve Jobs",
+      "rule_id": "bheri_yoga",
+      "rule_name": "Bheri Yoga",
+      "pyjhora_names": [
+        "bheri_yoga"
+      ]
+    },
+    {
+      "chart": "Steve Jobs",
+      "rule_id": "bvr_utthama_graha_yoga",
+      "rule_name": "Utthama Griha Yoga",
+      "pyjhora_names": [
+        "utthama_graha_yoga"
+      ]
+    },
+    {
+      "chart": "Steve Jobs",
+      "rule_id": "bvr_dehasthoulya_yoga",
+      "rule_name": "Dehasthoulya Yoga",
+      "pyjhora_names": [
+        "dehasthoulya_yoga_114",
+        "dehasthoulya_yoga_115",
+        "dehasthoulya_yoga_116"
       ]
     },
     {
       "chart": "Bill Gates",
-      "rule_id": "bvr_rogagrastha_precise",
-      "rule_name": "Rogagrastha Yoga",
+      "rule_id": "bvr_bhaga_chumbana_yoga",
+      "rule_name": "Bhaga Chumbana Yoga",
       "pyjhora_names": [
-        "rogagrastha_yoga"
-      ]
-    },
-    {
-      "chart": "Bill Gates",
-      "rule_id": "bvr_kaalanirdesat_puthranaasa_yoga",
-      "rule_name": "Kaalanirdesat Puthranaasa Yoga",
-      "pyjhora_names": [
-        "kaalanirdesat_puthranaasa_yoga_230",
-        "kaalanirdesat_puthranaasa_yoga_229"
+        "bhaga_chumbana_yoga"
       ]
     },
     {
@@ -2560,10 +2336,52 @@
     },
     {
       "chart": "Bill Gates",
-      "rule_id": "bvr_bhaga_chumbana_yoga",
-      "rule_name": "Bhaga Chumbana Yoga",
+      "rule_id": "bvr_rogagrastha_precise",
+      "rule_name": "Rogagrastha Yoga",
       "pyjhora_names": [
-        "bhaga_chumbana_yoga"
+        "rogagrastha_yoga"
+      ]
+    },
+    {
+      "chart": "Bill Gates",
+      "rule_id": "bvr_raja_bhanga_yoga",
+      "rule_name": "Raja Bhanga Yoga",
+      "pyjhora_names": [
+        "raja_bhanga_yoga_298",
+        "raja_bhanga_yoga_299"
+      ]
+    },
+    {
+      "chart": "Elon Musk",
+      "rule_id": "bvr_amala_precise",
+      "rule_name": "Amala Yoga",
+      "pyjhora_names": [
+        "amala_yoga"
+      ]
+    },
+    {
+      "chart": "Elon Musk",
+      "rule_id": "sankha_yoga",
+      "rule_name": "Sankha Yoga",
+      "pyjhora_names": [
+        "sankha_yoga"
+      ]
+    },
+    {
+      "chart": "Elon Musk",
+      "rule_id": "bvr_bandhu_pujya_yoga",
+      "rule_name": "Bandhu Pujya Yoga",
+      "pyjhora_names": [
+        "bandhu_pujya_yoga_193",
+        "bandhu_pujya_yoga_194"
+      ]
+    },
+    {
+      "chart": "Elon Musk",
+      "rule_id": "bheri_yoga",
+      "rule_name": "Bheri Yoga",
+      "pyjhora_names": [
+        "bheri_yoga"
       ]
     },
     {
@@ -2583,47 +2401,6 @@
         "krisanga_yoga_113"
       ]
     },
-    {
-      "chart": "Elon Musk",
-      "rule_id": "bheri_yoga",
-      "rule_name": "Bheri Yoga",
-      "pyjhora_names": [
-        "bheri_yoga"
-      ]
-    },
-    {
-      "chart": "Elon Musk",
-      "rule_id": "bvr_bandhu_pujya_yoga",
-      "rule_name": "Bandhu Pujya Yoga",
-      "pyjhora_names": [
-        "bandhu_pujya_yoga_193",
-        "bandhu_pujya_yoga_194"
-      ]
-    },
-    {
-      "chart": "Elon Musk",
-      "rule_id": "bvr_amala_precise",
-      "rule_name": "Amala Yoga",
-      "pyjhora_names": [
-        "amala_yoga"
-      ]
-    },
-    {
-      "chart": "Elon Musk",
-      "rule_id": "sankha_yoga",
-      "rule_name": "Sankha Yoga",
-      "pyjhora_names": [
-        "sankha_yoga"
-      ]
-    },
-    {
-      "chart": "Jeff Bezos",
-      "rule_id": "kahala_yoga",
-      "rule_name": "Kahala Yoga",
-      "pyjhora_names": [
-        "kaahala_yoga"
-      ]
-    },
     {
       "chart": "Jeff Bezos",
       "rule_id": "bvr_rogagrastha_precise",
@@ -2632,18 +2409,6 @@
         "rogagrastha_yoga"
       ]
     },
-    {
-      "chart": "Jeff Bezos",
-      "rule_id": "bvr_mathibhramana_yoga",
-      "rule_name": "Mathibhramana Yoga",
-      "pyjhora_names": [
-        "mathibhramana_yoga_291",
-        "mathibhramana_yoga_292",
-        "mathibhramana_yoga_293",
-        "mathibhramana_yoga_294",
-        "mathibhramana_yoga_variation"
-      ]
-    },
     {
       "chart": "Jeff Bezos",
       "rule_id": "bvr_dattha_puthra_yoga",
@@ -2663,7 +2428,15 @@
       ]
     },
     {
-      "chart": "Warren Buffett",
+      "chart": "Jeff Bezos",
+      "rule_id": "kahala_yoga",
+      "rule_name": "Kahala Yoga",
+      "pyjhora_names": [
+        "kaahala_yoga"
+      ]
+    },
+    {
+      "chart": "Jeff Bezos",
       "rule_id": "bvr_mathibhramana_yoga",
       "rule_name": "Mathibhramana Yoga",
       "pyjhora_names": [
@@ -2676,18 +2449,19 @@
     },
     {
       "chart": "Warren Buffett",
-      "rule_id": "bheri_yoga",
-      "rule_name": "Bheri Yoga",
+      "rule_id": "bvr_matrunasa_precise",
+      "rule_name": "Matrunasa Yoga",
       "pyjhora_names": [
-        "bheri_yoga"
+        "matrunasa_yoga_198",
+        "matrunasa_yoga_199"
       ]
     },
     {
       "chart": "Warren Buffett",
-      "rule_id": "bvr_swaveeryaddhana_precise",
-      "rule_name": "Swaveeryaddhana Yoga",
+      "rule_id": "bvr_bhaga_chumbana_yoga",
+      "rule_name": "Bhaga Chumbana Yoga",
       "pyjhora_names": [
-        "swaveeryaddhana_yoga"
+        "bhaga_chumbana_yoga"
       ]
     },
     {
@@ -2701,10 +2475,10 @@
     },
     {
       "chart": "Warren Buffett",
-      "rule_id": "bvr_bhaga_chumbana_yoga",
-      "rule_name": "Bhaga Chumbana Yoga",
+      "rule_id": "bheri_yoga",
+      "rule_name": "Bheri Yoga",
       "pyjhora_names": [
-        "bhaga_chumbana_yoga"
+        "bheri_yoga"
       ]
     },
     {
@@ -2717,11 +2491,22 @@
     },
     {
       "chart": "Warren Buffett",
-      "rule_id": "bvr_matrunasa_precise",
-      "rule_name": "Matrunasa Yoga",
+      "rule_id": "bvr_swaveeryaddhana_precise",
+      "rule_name": "Swaveeryaddhana Yoga",
       "pyjhora_names": [
-        "matrunasa_yoga_198",
-        "matrunasa_yoga_199"
+        "swaveeryaddhana_yoga"
+      ]
+    },
+    {
+      "chart": "Warren Buffett",
+      "rule_id": "bvr_mathibhramana_yoga",
+      "rule_name": "Mathibhramana Yoga",
+      "pyjhora_names": [
+        "mathibhramana_yoga_291",
+        "mathibhramana_yoga_292",
+        "mathibhramana_yoga_293",
+        "mathibhramana_yoga_294",
+        "mathibhramana_yoga_variation"
       ]
     },
     {
@@ -2735,14 +2520,6 @@
         "kapata_yoga_204"
       ]
     },
-    {
-      "chart": "Mukesh Ambani",
-      "rule_id": "kahala_yoga",
-      "rule_name": "Kahala Yoga",
-      "pyjhora_names": [
-        "kaahala_yoga"
-      ]
-    },
     {
       "chart": "Mukesh Ambani",
       "rule_id": "parvata_yoga",
@@ -2760,13 +2537,25 @@
       ]
     },
     {
-      "chart": "Ratan Tata",
+      "chart": "Mukesh Ambani",
       "rule_id": "kahala_yoga",
       "rule_name": "Kahala Yoga",
       "pyjhora_names": [
         "kaahala_yoga"
       ]
     },
+    {
+      "chart": "Mukesh Ambani",
+      "rule_id": "bvr_mathibhramana_yoga",
+      "rule_name": "Mathibhramana Yoga",
+      "pyjhora_names": [
+        "mathibhramana_yoga_291",
+        "mathibhramana_yoga_292",
+        "mathibhramana_yoga_293",
+        "mathibhramana_yoga_294",
+        "mathibhramana_yoga_variation"
+      ]
+    },
     {
       "chart": "Ratan Tata",
       "rule_id": "bvr_bhratruvriddhi_precise",
@@ -2775,15 +2564,6 @@
         "bhratruvriddhi_yoga"
       ]
     },
-    {
-      "chart": "Ratan Tata",
-      "rule_id": "bvr_bahu_puthra_precise",
-      "rule_name": "Bahu Puthra Yoga",
-      "pyjhora_names": [
-        "bahu_puthra_yoga_220",
-        "bahu_puthra_yoga_221"
-      ]
-    },
     {
       "chart": "Ratan Tata",
       "rule_id": "bvr_rogagrastha_precise",
@@ -2802,17 +2582,7 @@
       ]
     },
     {
-      "chart": "Narayana Murthy",
-      "rule_id": "bvr_dehasthoulya_yoga",
-      "rule_name": "Dehasthoulya Yoga",
-      "pyjhora_names": [
-        "dehasthoulya_yoga_114",
-        "dehasthoulya_yoga_115",
-        "dehasthoulya_yoga_116"
-      ]
-    },
-    {
-      "chart": "Narayana Murthy",
+      "chart": "Ratan Tata",
       "rule_id": "bvr_bahu_puthra_precise",
       "rule_name": "Bahu Puthra Yoga",
       "pyjhora_names": [
@@ -2820,6 +2590,14 @@
         "bahu_puthra_yoga_221"
       ]
     },
+    {
+      "chart": "Ratan Tata",
+      "rule_id": "kahala_yoga",
+      "rule_name": "Kahala Yoga",
+      "pyjhora_names": [
+        "kaahala_yoga"
+      ]
+    },
     {
       "chart": "Narayana Murthy",
       "rule_id": "bvr_rogagrastha_precise",
@@ -2836,6 +2614,17 @@
         "bandhubhisthyaktha_yoga"
       ]
     },
+    {
+      "chart": "Narayana Murthy",
+      "rule_id": "bvr_nishkapata_precise",
+      "rule_name": "Nishkapata Yoga",
+      "pyjhora_names": [
+        "nishkapata_yoga_205",
+        "nishkapata_yoga_206",
+        "kapata_yoga_202",
+        "kapata_yoga_204"
+      ]
+    },
     {
       "chart": "Narayana Murthy",
       "rule_id": "adhi_yoga",
@@ -2844,6 +2633,25 @@
         "adhi_yoga"
       ]
     },
+    {
+      "chart": "Narayana Murthy",
+      "rule_id": "bvr_bahu_puthra_precise",
+      "rule_name": "Bahu Puthra Yoga",
+      "pyjhora_names": [
+        "bahu_puthra_yoga_220",
+        "bahu_puthra_yoga_221"
+      ]
+    },
+    {
+      "chart": "Narayana Murthy",
+      "rule_id": "bvr_dehasthoulya_yoga",
+      "rule_name": "Dehasthoulya Yoga",
+      "pyjhora_names": [
+        "dehasthoulya_yoga_114",
+        "dehasthoulya_yoga_115",
+        "dehasthoulya_yoga_116"
+      ]
+    },
     {
       "chart": "Narayana Murthy",
       "rule_id": "bvr_mathibhramana_yoga",
@@ -2857,7 +2665,7 @@
       ]
     },
     {
-      "chart": "Narayana Murthy",
+      "chart": "Azim Premji",
       "rule_id": "bvr_nishkapata_precise",
       "rule_name": "Nishkapata Yoga",
       "pyjhora_names": [
@@ -2867,22 +2675,6 @@
         "kapata_yoga_204"
       ]
     },
-    {
-      "chart": "Azim Premji",
-      "rule_id": "kahala_yoga",
-      "rule_name": "Kahala Yoga",
-      "pyjhora_names": [
-        "kaahala_yoga"
-      ]
-    },
-    {
-      "chart": "Azim Premji",
-      "rule_id": "bvr_rogagrastha_precise",
-      "rule_name": "Rogagrastha Yoga",
-      "pyjhora_names": [
-        "rogagrastha_yoga"
-      ]
-    },
     {
       "chart": "Azim Premji",
       "rule_id": "bvr_krisanga_yoga",
@@ -2894,31 +2686,20 @@
     },
     {
       "chart": "Azim Premji",
-      "rule_id": "bvr_dama_yoga",
-      "rule_name": "Dama Yoga",
-      "pyjhora_names": [
-        "dama_yoga"
-      ]
-    },
-    {
-      "chart": "Azim Premji",
-      "rule_id": "bvr_nishkapata_precise",
-      "rule_name": "Nishkapata Yoga",
-      "pyjhora_names": [
-        "nishkapata_yoga_205",
-        "nishkapata_yoga_206",
-        "kapata_yoga_202",
-        "kapata_yoga_204"
-      ]
-    },
-    {
-      "chart": "Dhirubhai Ambani",
       "rule_id": "kahala_yoga",
       "rule_name": "Kahala Yoga",
       "pyjhora_names": [
         "kaahala_yoga"
       ]
     },
+    {
+      "chart": "Azim Premji",
+      "rule_id": "bvr_dama_yoga",
+      "rule_name": "Dama Yoga",
+      "pyjhora_names": [
+        "dama_yoga"
+      ]
+    },
     {
       "chart": "Dhirubhai Ambani",
       "rule_id": "bvr_grihanasa_yoga",
@@ -2930,10 +2711,10 @@
     },
     {
       "chart": "Dhirubhai Ambani",
-      "rule_id": "bvr_rogagrastha_precise",
-      "rule_name": "Rogagrastha Yoga",
+      "rule_id": "bheri_yoga",
+      "rule_name": "Bheri Yoga",
       "pyjhora_names": [
-        "rogagrastha_yoga"
+        "bheri_yoga"
       ]
     },
     {
@@ -2947,10 +2728,10 @@
     },
     {
       "chart": "Dhirubhai Ambani",
-      "rule_id": "bheri_yoga",
-      "rule_name": "Bheri Yoga",
+      "rule_id": "kahala_yoga",
+      "rule_name": "Kahala Yoga",
       "pyjhora_names": [
-        "bheri_yoga"
+        "kaahala_yoga"
       ]
     },
     {
@@ -2967,10 +2748,10 @@
     },
     {
       "chart": "Sachin Tendulkar",
-      "rule_id": "kahala_yoga",
-      "rule_name": "Kahala Yoga",
+      "rule_id": "bvr_pisacha_grastha_yoga",
+      "rule_name": "Pisacha Grastha Yoga",
       "pyjhora_names": [
-        "kaahala_yoga"
+        "pisacha_grastha_yoga"
       ]
     },
     {
@@ -2982,31 +2763,6 @@
         "bahu_puthra_yoga_221"
       ]
     },
-    {
-      "chart": "Sachin Tendulkar",
-      "rule_id": "bvr_rogagrastha_precise",
-      "rule_name": "Rogagrastha Yoga",
-      "pyjhora_names": [
-        "rogagrastha_yoga"
-      ]
-    },
-    {
-      "chart": "Sachin Tendulkar",
-      "rule_id": "bvr_kaalanirdesat_puthranaasa_yoga",
-      "rule_name": "Kaalanirdesat Puthranaasa Yoga",
-      "pyjhora_names": [
-        "kaalanirdesat_puthranaasa_yoga_230",
-        "kaalanirdesat_puthranaasa_yoga_229"
-      ]
-    },
-    {
-      "chart": "Sachin Tendulkar",
-      "rule_id": "bvr_pisacha_grastha_yoga",
-      "rule_name": "Pisacha Grastha Yoga",
-      "pyjhora_names": [
-        "pisacha_grastha_yoga"
-      ]
-    },
     {
       "chart": "Sachin Tendulkar",
       "rule_id": "bheri_yoga",
@@ -3016,38 +2772,11 @@
       ]
     },
     {
-      "chart": "Virat Kohli",
-      "rule_id": "bvr_dehasthoulya_yoga",
-      "rule_name": "Dehasthoulya Yoga",
+      "chart": "Sachin Tendulkar",
+      "rule_id": "kahala_yoga",
+      "rule_name": "Kahala Yoga",
       "pyjhora_names": [
-        "dehasthoulya_yoga_114",
-        "dehasthoulya_yoga_115",
-        "dehasthoulya_yoga_116"
-      ]
-    },
-    {
-      "chart": "Virat Kohli",
-      "rule_id": "bvr_kaalanirdesat_puthranaasa_yoga",
-      "rule_name": "Kaalanirdesat Puthranaasa Yoga",
-      "pyjhora_names": [
-        "kaalanirdesat_puthranaasa_yoga_230",
-        "kaalanirdesat_puthranaasa_yoga_229"
-      ]
-    },
-    {
-      "chart": "Virat Kohli",
-      "rule_id": "bvr_sada_sanchara_precise",
-      "rule_name": "Sada Sanchara Yoga",
-      "pyjhora_names": [
-        "sada_sanchara_yoga"
-      ]
-    },
-    {
-      "chart": "Virat Kohli",
-      "rule_id": "bvr_dama_yoga",
-      "rule_name": "Dama Yoga",
-      "pyjhora_names": [
-        "dama_yoga"
+        "kaahala_yoga"
       ]
     },
     {
@@ -3058,6 +2787,14 @@
         "sumukha_yoga"
       ]
     },
+    {
+      "chart": "Virat Kohli",
+      "rule_id": "bvr_dama_yoga",
+      "rule_name": "Dama Yoga",
+      "pyjhora_names": [
+        "dama_yoga"
+      ]
+    },
     {
       "chart": "Virat Kohli",
       "rule_id": "bvr_bhaga_chumbana_yoga",
@@ -3075,11 +2812,30 @@
       ]
     },
     {
-      "chart": "MS Dhoni",
-      "rule_id": "kahala_yoga",
-      "rule_name": "Kahala Yoga",
+      "chart": "Virat Kohli",
+      "rule_id": "bvr_dehasthoulya_yoga",
+      "rule_name": "Dehasthoulya Yoga",
       "pyjhora_names": [
-        "kaahala_yoga"
+        "dehasthoulya_yoga_114",
+        "dehasthoulya_yoga_115",
+        "dehasthoulya_yoga_116"
+      ]
+    },
+    {
+      "chart": "Virat Kohli",
+      "rule_id": "bvr_sada_sanchara_precise",
+      "rule_name": "Sada Sanchara Yoga",
+      "pyjhora_names": [
+        "sada_sanchara_yoga"
+      ]
+    },
+    {
+      "chart": "Virat Kohli",
+      "rule_id": "bvr_kaalanirdesat_puthranaasa_yoga",
+      "rule_name": "Kaalanirdesat Puthranaasa Yoga",
+      "pyjhora_names": [
+        "kaalanirdesat_puthranaasa_yoga_230",
+        "kaalanirdesat_puthranaasa_yoga_229"
       ]
     },
     {
@@ -3093,11 +2849,28 @@
     },
     {
       "chart": "MS Dhoni",
-      "rule_id": "bvr_kaalanirdesat_puthranaasa_yoga",
-      "rule_name": "Kaalanirdesat Puthranaasa Yoga",
+      "rule_id": "kahala_yoga",
+      "rule_name": "Kahala Yoga",
       "pyjhora_names": [
-        "kaalanirdesat_puthranaasa_yoga_230",
-        "kaalanirdesat_puthranaasa_yoga_229"
+        "kaahala_yoga"
+      ]
+    },
+    {
+      "chart": "Muhammad Ali",
+      "rule_id": "bvr_bhaga_chumbana_yoga",
+      "rule_name": "Bhaga Chumbana Yoga",
+      "pyjhora_names": [
+        "bhaga_chumbana_yoga"
+      ]
+    },
+    {
+      "chart": "Muhammad Ali",
+      "rule_id": "bvr_dehasthoulya_yoga",
+      "rule_name": "Dehasthoulya Yoga",
+      "pyjhora_names": [
+        "dehasthoulya_yoga_114",
+        "dehasthoulya_yoga_115",
+        "dehasthoulya_yoga_116"
       ]
     },
     {
@@ -3110,30 +2883,11 @@
     },
     {
       "chart": "Muhammad Ali",
-      "rule_id": "bvr_dehasthoulya_yoga",
-      "rule_name": "Dehasthoulya Yoga",
+      "rule_id": "bvr_kaalanirdesat_puthranaasa_yoga",
+      "rule_name": "Kaalanirdesat Puthranaasa Yoga",
       "pyjhora_names": [
-        "dehasthoulya_yoga_114",
-        "dehasthoulya_yoga_115",
-        "dehasthoulya_yoga_116"
-      ]
-    },
-    {
-      "chart": "Muhammad Ali",
-      "rule_id": "bvr_bhaga_chumbana_yoga",
-      "rule_name": "Bhaga Chumbana Yoga",
-      "pyjhora_names": [
-        "bhaga_chumbana_yoga"
-      ]
-    },
-    {
-      "chart": "Michael Jordan",
-      "rule_id": "bvr_dehasthoulya_yoga",
-      "rule_name": "Dehasthoulya Yoga",
-      "pyjhora_names": [
-        "dehasthoulya_yoga_114",
-        "dehasthoulya_yoga_115",
-        "dehasthoulya_yoga_116"
+        "kaalanirdesat_puthranaasa_yoga_230",
+        "kaalanirdesat_puthranaasa_yoga_229"
       ]
     },
     {
@@ -3153,6 +2907,30 @@
         "bhaga_chumbana_yoga"
       ]
     },
+    {
+      "chart": "Michael Jordan",
+      "rule_id": "bvr_dharidhra_11_precise",
+      "rule_name": "Dharidhra Yoga",
+      "pyjhora_names": [
+        "dharidhra_yoga_144",
+        "dharidhra_yoga_147",
+        "dharidhra_yoga_148",
+        "dharidhra_yoga_149",
+        "dharidhra_yoga_150",
+        "dharidhra_yoga_151",
+        "dharidhra_yoga_152"
+      ]
+    },
+    {
+      "chart": "Michael Jordan",
+      "rule_id": "bvr_dehasthoulya_yoga",
+      "rule_name": "Dehasthoulya Yoga",
+      "pyjhora_names": [
+        "dehasthoulya_yoga_114",
+        "dehasthoulya_yoga_115",
+        "dehasthoulya_yoga_116"
+      ]
+    },
     {
       "chart": "Michael Jordan",
       "rule_id": "bvr_swaveeryaddhana_precise",
@@ -3163,6 +2941,24 @@
     },
     {
       "chart": "Michael Jordan",
+      "rule_id": "bvr_kaalanirdesat_puthranaasa_yoga",
+      "rule_name": "Kaalanirdesat Puthranaasa Yoga",
+      "pyjhora_names": [
+        "kaalanirdesat_puthranaasa_yoga_230",
+        "kaalanirdesat_puthranaasa_yoga_229"
+      ]
+    },
+    {
+      "chart": "Lionel Messi",
+      "rule_id": "bvr_matrudeerghayur_yoga",
+      "rule_name": "Matrudeerghayur Yoga",
+      "pyjhora_names": [
+        "matrudeerghayur_yoga_196",
+        "matrudeerghayur_yoga_197"
+      ]
+    },
+    {
+      "chart": "Lionel Messi",
       "rule_id": "bvr_dharidhra_11_precise",
       "rule_name": "Dharidhra Yoga",
       "pyjhora_names": [
@@ -3175,15 +2971,6 @@
         "dharidhra_yoga_152"
       ]
     },
-    {
-      "chart": "Lionel Messi",
-      "rule_id": "bvr_kaalanirdesat_puthranaasa_yoga",
-      "rule_name": "Kaalanirdesat Puthranaasa Yoga",
-      "pyjhora_names": [
-        "kaalanirdesat_puthranaasa_yoga_230",
-        "kaalanirdesat_puthranaasa_yoga_229"
-      ]
-    },
     {
       "chart": "Lionel Messi",
       "rule_id": "bvr_sada_sanchara_precise",
@@ -3192,6 +2979,22 @@
         "sada_sanchara_yoga"
       ]
     },
+    {
+      "chart": "Lionel Messi",
+      "rule_id": "bvr_matru_sneha_yoga",
+      "rule_name": "Matru Sneha Yoga",
+      "pyjhora_names": [
+        "matru_sneha_yoga"
+      ]
+    },
+    {
+      "chart": "Lionel Messi",
+      "rule_id": "bvr_swaveeryaddhana_precise",
+      "rule_name": "Swaveeryaddhana Yoga",
+      "pyjhora_names": [
+        "swaveeryaddhana_yoga"
+      ]
+    },
     {
       "chart": "Lionel Messi",
       "rule_id": "bvr_mathibhramana_yoga",
@@ -3204,61 +3007,6 @@
         "mathibhramana_yoga_variation"
       ]
     },
-    {
-      "chart": "Lionel Messi",
-      "rule_id": "bvr_matru_sneha_yoga",
-      "rule_name": "Matru Sneha Yoga",
-      "pyjhora_names": [
-        "matru_sneha_yoga"
-      ]
-    },
-    {
-      "chart": "Lionel Messi",
-      "rule_id": "bvr_matrudeerghayur_yoga",
-      "rule_name": "Matrudeerghayur Yoga",
-      "pyjhora_names": [
-        "matrudeerghayur_yoga_196",
-        "matrudeerghayur_yoga_197"
-      ]
-    },
-    {
-      "chart": "Lionel Messi",
-      "rule_id": "bvr_swaveeryaddhana_precise",
-      "rule_name": "Swaveeryaddhana Yoga",
-      "pyjhora_names": [
-        "swaveeryaddhana_yoga"
-      ]
-    },
-    {
-      "chart": "Lionel Messi",
-      "rule_id": "bvr_dharidhra_11_precise",
-      "rule_name": "Dharidhra Yoga",
-      "pyjhora_names": [
-        "dharidhra_yoga_144",
-        "dharidhra_yoga_147",
-        "dharidhra_yoga_148",
-        "dharidhra_yoga_149",
-        "dharidhra_yoga_150",
-        "dharidhra_yoga_151",
-        "dharidhra_yoga_152"
-      ]
-    },
-    {
-      "chart": "Cristiano Ronaldo",
-      "rule_id": "kahala_yoga",
-      "rule_name": "Kahala Yoga",
-      "pyjhora_names": [
-        "kaahala_yoga"
-      ]
-    },
-    {
-      "chart": "Cristiano Ronaldo",
-      "rule_id": "bvr_yuddha_marana_yoga",
-      "rule_name": "Yuddha Marana Yoga",
-      "pyjhora_names": [
-        "yuddha_marana_yoga"
-      ]
-    },
     {
       "chart": "Cristiano Ronaldo",
       "rule_id": "bvr_rogagrastha_precise",
@@ -3267,15 +3015,6 @@
         "rogagrastha_yoga"
       ]
     },
-    {
-      "chart": "Cristiano Ronaldo",
-      "rule_id": "bvr_kalaanidhi_yoga",
-      "rule_name": "Kalaanidhi Yoga",
-      "pyjhora_names": [
-        "kalaanidhi_yoga",
-        "kalanidhi_yoga"
-      ]
-    },
     {
       "chart": "Cristiano Ronaldo",
       "rule_id": "bvr_nishkapata_precise",
@@ -3296,15 +3035,37 @@
       ]
     },
     {
-      "chart": "Serena Williams",
-      "rule_id": "bvr_mathibhramana_yoga",
-      "rule_name": "Mathibhramana Yoga",
+      "chart": "Cristiano Ronaldo",
+      "rule_id": "bvr_kalaanidhi_yoga",
+      "rule_name": "Kalaanidhi Yoga",
       "pyjhora_names": [
-        "mathibhramana_yoga_291",
-        "mathibhramana_yoga_292",
-        "mathibhramana_yoga_293",
-        "mathibhramana_yoga_294",
-        "mathibhramana_yoga_variation"
+        "kalaanidhi_yoga",
+        "kalanidhi_yoga"
+      ]
+    },
+    {
+      "chart": "Cristiano Ronaldo",
+      "rule_id": "bvr_yuddha_marana_yoga",
+      "rule_name": "Yuddha Marana Yoga",
+      "pyjhora_names": [
+        "yuddha_marana_yoga"
+      ]
+    },
+    {
+      "chart": "Cristiano Ronaldo",
+      "rule_id": "kahala_yoga",
+      "rule_name": "Kahala Yoga",
+      "pyjhora_names": [
+        "kaahala_yoga"
+      ]
+    },
+    {
+      "chart": "Serena Williams",
+      "rule_id": "bvr_matrunasa_precise",
+      "rule_name": "Matrunasa Yoga",
+      "pyjhora_names": [
+        "matrunasa_yoga_198",
+        "matrunasa_yoga_199"
       ]
     },
     {
@@ -3316,14 +3077,6 @@
         "bandhu_pujya_yoga_194"
       ]
     },
-    {
-      "chart": "Serena Williams",
-      "rule_id": "bvr_swaveeryaddhana_precise",
-      "rule_name": "Swaveeryaddhana Yoga",
-      "pyjhora_names": [
-        "swaveeryaddhana_yoga"
-      ]
-    },
     {
       "chart": "Serena Williams",
       "rule_id": "bvr_ayatna_griha_prapta_yoga",
@@ -3335,19 +3088,22 @@
     },
     {
       "chart": "Serena Williams",
-      "rule_id": "sankha_yoga",
-      "rule_name": "Sankha Yoga",
+      "rule_id": "bvr_swaveeryaddhana_precise",
+      "rule_name": "Swaveeryaddhana Yoga",
       "pyjhora_names": [
-        "sankha_yoga"
+        "swaveeryaddhana_yoga"
       ]
     },
     {
       "chart": "Serena Williams",
-      "rule_id": "bvr_matrunasa_precise",
-      "rule_name": "Matrunasa Yoga",
+      "rule_id": "bvr_mathibhramana_yoga",
+      "rule_name": "Mathibhramana Yoga",
       "pyjhora_names": [
-        "matrunasa_yoga_198",
-        "matrunasa_yoga_199"
+        "mathibhramana_yoga_291",
+        "mathibhramana_yoga_292",
+        "mathibhramana_yoga_293",
+        "mathibhramana_yoga_294",
+        "mathibhramana_yoga_variation"
       ]
     },
     {
@@ -3382,16 +3138,6 @@
         "mathibhramana_yoga_variation"
       ]
     },
-    {
-      "chart": "Roger Federer",
-      "rule_id": "bvr_dehasthoulya_yoga",
-      "rule_name": "Dehasthoulya Yoga",
-      "pyjhora_names": [
-        "dehasthoulya_yoga_114",
-        "dehasthoulya_yoga_115",
-        "dehasthoulya_yoga_116"
-      ]
-    },
     {
       "chart": "Roger Federer",
       "rule_id": "parvata_yoga",
@@ -3402,11 +3148,12 @@
     },
     {
       "chart": "Roger Federer",
-      "rule_id": "bvr_bahu_puthra_precise",
-      "rule_name": "Bahu Puthra Yoga",
+      "rule_id": "bvr_dehasthoulya_yoga",
+      "rule_name": "Dehasthoulya Yoga",
       "pyjhora_names": [
-        "bahu_puthra_yoga_220",
-        "bahu_puthra_yoga_221"
+        "dehasthoulya_yoga_114",
+        "dehasthoulya_yoga_115",
+        "dehasthoulya_yoga_116"
       ]
     },
     {
@@ -3418,11 +3165,12 @@
       ]
     },
     {
-      "chart": "Swami Vivekananda",
-      "rule_id": "bvr_matru_sneha_yoga",
-      "rule_name": "Matru Sneha Yoga",
+      "chart": "Roger Federer",
+      "rule_id": "bvr_bahu_puthra_precise",
+      "rule_name": "Bahu Puthra Yoga",
       "pyjhora_names": [
-        "matru_sneha_yoga"
+        "bahu_puthra_yoga_220",
+        "bahu_puthra_yoga_221"
       ]
     },
     {
@@ -3434,6 +3182,14 @@
         "ayatna_griha_prapta_yoga_190"
       ]
     },
+    {
+      "chart": "Swami Vivekananda",
+      "rule_id": "bvr_matru_sneha_yoga",
+      "rule_name": "Matru Sneha Yoga",
+      "pyjhora_names": [
+        "matru_sneha_yoga"
+      ]
+    },
     {
       "chart": "Swami Vivekananda",
       "rule_id": "bheri_yoga",
@@ -3442,6 +3198,23 @@
         "bheri_yoga"
       ]
     },
+    {
+      "chart": "Amitabh Bachchan",
+      "rule_id": "bvr_rogagrastha_precise",
+      "rule_name": "Rogagrastha Yoga",
+      "pyjhora_names": [
+        "rogagrastha_yoga"
+      ]
+    },
+    {
+      "chart": "Amitabh Bachchan",
+      "rule_id": "bvr_matrunasa_precise",
+      "rule_name": "Matrunasa Yoga",
+      "pyjhora_names": [
+        "matrunasa_yoga_198",
+        "matrunasa_yoga_199"
+      ]
+    },
     {
       "chart": "Amitabh Bachchan",
       "rule_id": "bvr_dehasthoulya_yoga",
@@ -3452,14 +3225,6 @@
         "dehasthoulya_yoga_116"
       ]
     },
-    {
-      "chart": "Amitabh Bachchan",
-      "rule_id": "bvr_rogagrastha_precise",
-      "rule_name": "Rogagrastha Yoga",
-      "pyjhora_names": [
-        "rogagrastha_yoga"
-      ]
-    },
     {
       "chart": "Amitabh Bachchan",
       "rule_id": "bvr_swaveeryaddhana_precise",
@@ -3480,15 +3245,6 @@
         "mathibhramana_yoga_variation"
       ]
     },
-    {
-      "chart": "Amitabh Bachchan",
-      "rule_id": "bvr_matrunasa_precise",
-      "rule_name": "Matrunasa Yoga",
-      "pyjhora_names": [
-        "matrunasa_yoga_198",
-        "matrunasa_yoga_199"
-      ]
-    },
     {
       "chart": "Queen Elizabeth II",
       "rule_id": "kahala_yoga",
@@ -3497,22 +3253,6 @@
         "kaahala_yoga"
       ]
     },
-    {
-      "chart": "Queen Elizabeth II",
-      "rule_id": "bvr_dama_yoga",
-      "rule_name": "Dama Yoga",
-      "pyjhora_names": [
-        "dama_yoga"
-      ]
-    },
-    {
-      "chart": "Queen Elizabeth II",
-      "rule_id": "bvr_rogagrastha_precise",
-      "rule_name": "Rogagrastha Yoga",
-      "pyjhora_names": [
-        "rogagrastha_yoga"
-      ]
-    },
     {
       "chart": "Queen Elizabeth II",
       "rule_id": "bheri_yoga",
@@ -3521,6 +3261,14 @@
         "bheri_yoga"
       ]
     },
+    {
+      "chart": "Queen Elizabeth II",
+      "rule_id": "bvr_dama_yoga",
+      "rule_name": "Dama Yoga",
+      "pyjhora_names": [
+        "dama_yoga"
+      ]
+    },
     {
       "chart": "Princess Diana",
       "rule_id": "bvr_nishkapata_precise",
@@ -3532,15 +3280,6 @@
         "kapata_yoga_204"
       ]
     },
-    {
-      "chart": "Princess Diana",
-      "rule_id": "bvr_kaalanirdesat_puthranaasa_yoga",
-      "rule_name": "Kaalanirdesat Puthranaasa Yoga",
-      "pyjhora_names": [
-        "kaalanirdesat_puthranaasa_yoga_230",
-        "kaalanirdesat_puthranaasa_yoga_229"
-      ]
-    },
     {
       "chart": "Princess Diana",
       "rule_id": "bvr_grihanasa_yoga",
@@ -3559,12 +3298,24 @@
       ]
     },
     {
-      "chart": "Dalai Lama",
-      "rule_id": "bvr_bahu_puthra_precise",
-      "rule_name": "Bahu Puthra Yoga",
+      "chart": "Princess Diana",
+      "rule_id": "bvr_mathibhramana_yoga",
+      "rule_name": "Mathibhramana Yoga",
       "pyjhora_names": [
-        "bahu_puthra_yoga_220",
-        "bahu_puthra_yoga_221"
+        "mathibhramana_yoga_291",
+        "mathibhramana_yoga_292",
+        "mathibhramana_yoga_293",
+        "mathibhramana_yoga_294",
+        "mathibhramana_yoga_variation"
+      ]
+    },
+    {
+      "chart": "Princess Diana",
+      "rule_id": "bvr_kaalanirdesat_puthranaasa_yoga",
+      "rule_name": "Kaalanirdesat Puthranaasa Yoga",
+      "pyjhora_names": [
+        "kaalanirdesat_puthranaasa_yoga_230",
+        "kaalanirdesat_puthranaasa_yoga_229"
       ]
     },
     {
@@ -3575,22 +3326,6 @@
         "rogagrastha_yoga"
       ]
     },
-    {
-      "chart": "Dalai Lama",
-      "rule_id": "parvata_yoga",
-      "rule_name": "Parvata Yoga",
-      "pyjhora_names": [
-        "parvata_yoga"
-      ]
-    },
-    {
-      "chart": "Dalai Lama",
-      "rule_id": "bvr_swaveeryaddhana_precise",
-      "rule_name": "Swaveeryaddhana Yoga",
-      "pyjhora_names": [
-        "swaveeryaddhana_yoga"
-      ]
-    },
     {
       "chart": "Dalai Lama",
       "rule_id": "bvr_nishkapata_precise",
@@ -3602,6 +3337,23 @@
         "kapata_yoga_204"
       ]
     },
+    {
+      "chart": "Dalai Lama",
+      "rule_id": "parvata_yoga",
+      "rule_name": "Parvata Yoga",
+      "pyjhora_names": [
+        "parvata_yoga"
+      ]
+    },
+    {
+      "chart": "Dalai Lama",
+      "rule_id": "bvr_bahu_puthra_precise",
+      "rule_name": "Bahu Puthra Yoga",
+      "pyjhora_names": [
+        "bahu_puthra_yoga_220",
+        "bahu_puthra_yoga_221"
+      ]
+    },
     {
       "chart": "Dalai Lama",
       "rule_id": "bvr_ayatna_griha_prapta_yoga",
@@ -3611,6 +3363,14 @@
         "ayatna_griha_prapta_yoga_190"
       ]
     },
+    {
+      "chart": "Dalai Lama",
+      "rule_id": "bvr_swaveeryaddhana_precise",
+      "rule_name": "Swaveeryaddhana Yoga",
+      "pyjhora_names": [
+        "swaveeryaddhana_yoga"
+      ]
+    },
     {
       "chart": "Pope Francis",
       "rule_id": "bvr_bhratruvriddhi_precise",
@@ -3619,6 +3379,15 @@
         "bhratruvriddhi_yoga"
       ]
     },
+    {
+      "chart": "Pope Francis",
+      "rule_id": "bvr_matrunasa_precise",
+      "rule_name": "Matrunasa Yoga",
+      "pyjhora_names": [
+        "matrunasa_yoga_198",
+        "matrunasa_yoga_199"
+      ]
+    },
     {
       "chart": "Pope Francis",
       "rule_id": "bvr_raja_bhanga_yoga",
@@ -3646,12 +3415,14 @@
       ]
     },
     {
-      "chart": "Pope Francis",
-      "rule_id": "bvr_matrunasa_precise",
-      "rule_name": "Matrunasa Yoga",
+      "chart": "Osho",
+      "rule_id": "bvr_nishkapata_precise",
+      "rule_name": "Nishkapata Yoga",
       "pyjhora_names": [
-        "matrunasa_yoga_198",
-        "matrunasa_yoga_199"
+        "nishkapata_yoga_205",
+        "nishkapata_yoga_206",
+        "kapata_yoga_202",
+        "kapata_yoga_204"
       ]
     },
     {
@@ -3692,14 +3463,11 @@
       ]
     },
     {
-      "chart": "Osho",
-      "rule_id": "bvr_nishkapata_precise",
-      "rule_name": "Nishkapata Yoga",
+      "chart": "J. Krishnamurti",
+      "rule_id": "bvr_sumukha_precise",
+      "rule_name": "Sumukha Yoga",
       "pyjhora_names": [
-        "nishkapata_yoga_205",
-        "nishkapata_yoga_206",
-        "kapata_yoga_202",
-        "kapata_yoga_204"
+        "sumukha_yoga"
       ]
     },
     {
@@ -3727,14 +3495,6 @@
         "kaalanirdesat_puthranaasa_yoga_229"
       ]
     },
-    {
-      "chart": "J. Krishnamurti",
-      "rule_id": "bvr_sumukha_precise",
-      "rule_name": "Sumukha Yoga",
-      "pyjhora_names": [
-        "sumukha_yoga"
-      ]
-    },
     {
       "chart": "Ramana Maharshi",
       "rule_id": "bvr_nishkapata_precise",
@@ -3748,10 +3508,10 @@
     },
     {
       "chart": "Ramana Maharshi",
-      "rule_id": "kahala_yoga",
-      "rule_name": "Kahala Yoga",
+      "rule_id": "sankha_yoga",
+      "rule_name": "Sankha Yoga",
       "pyjhora_names": [
-        "kaahala_yoga"
+        "sankha_yoga"
       ]
     },
     {
@@ -3763,55 +3523,13 @@
       ]
     },
     {
-      "chart": "Paramahansa Yogananda",
+      "chart": "Ramana Maharshi",
       "rule_id": "kahala_yoga",
       "rule_name": "Kahala Yoga",
       "pyjhora_names": [
         "kaahala_yoga"
       ]
     },
-    {
-      "chart": "Paramahansa Yogananda",
-      "rule_id": "bvr_yuddha_marana_yoga",
-      "rule_name": "Yuddha Marana Yoga",
-      "pyjhora_names": [
-        "yuddha_marana_yoga"
-      ]
-    },
-    {
-      "chart": "Paramahansa Yogananda",
-      "rule_id": "bvr_bahu_puthra_precise",
-      "rule_name": "Bahu Puthra Yoga",
-      "pyjhora_names": [
-        "bahu_puthra_yoga_220",
-        "bahu_puthra_yoga_221"
-      ]
-    },
-    {
-      "chart": "Paramahansa Yogananda",
-      "rule_id": "bvr_rogagrastha_precise",
-      "rule_name": "Rogagrastha Yoga",
-      "pyjhora_names": [
-        "rogagrastha_yoga"
-      ]
-    },
-    {
-      "chart": "Paramahansa Yogananda",
-      "rule_id": "bvr_krisanga_yoga",
-      "rule_name": "Krisanga Yoga",
-      "pyjhora_names": [
-        "krisanga_yoga_112",
-        "krisanga_yoga_113"
-      ]
-    },
-    {
-      "chart": "Paramahansa Yogananda",
-      "rule_id": "bvr_bhaga_chumbana_yoga",
-      "rule_name": "Bhaga Chumbana Yoga",
-      "pyjhora_names": [
-        "bhaga_chumbana_yoga"
-      ]
-    },
     {
       "chart": "Paramahansa Yogananda",
       "rule_id": "bvr_nishkapata_precise",
@@ -3831,6 +3549,48 @@
         "matrunasa_yoga_198",
         "matrunasa_yoga_199"
       ]
+    },
+    {
+      "chart": "Paramahansa Yogananda",
+      "rule_id": "bvr_bhaga_chumbana_yoga",
+      "rule_name": "Bhaga Chumbana Yoga",
+      "pyjhora_names": [
+        "bhaga_chumbana_yoga"
+      ]
+    },
+    {
+      "chart": "Paramahansa Yogananda",
+      "rule_id": "bvr_bahu_puthra_precise",
+      "rule_name": "Bahu Puthra Yoga",
+      "pyjhora_names": [
+        "bahu_puthra_yoga_220",
+        "bahu_puthra_yoga_221"
+      ]
+    },
+    {
+      "chart": "Paramahansa Yogananda",
+      "rule_id": "bvr_yuddha_marana_yoga",
+      "rule_name": "Yuddha Marana Yoga",
+      "pyjhora_names": [
+        "yuddha_marana_yoga"
+      ]
+    },
+    {
+      "chart": "Paramahansa Yogananda",
+      "rule_id": "bvr_krisanga_yoga",
+      "rule_name": "Krisanga Yoga",
+      "pyjhora_names": [
+        "krisanga_yoga_112",
+        "krisanga_yoga_113"
+      ]
+    },
+    {
+      "chart": "Paramahansa Yogananda",
+      "rule_id": "kahala_yoga",
+      "rule_name": "Kahala Yoga",
+      "pyjhora_names": [
+        "kaahala_yoga"
+      ]
     }
   ]
 }
\ No newline at end of file
diff --git a/references/yoga_rules.json b/references/yoga_rules.json
index b894d078..51d36553 100644
--- a/references/yoga_rules.json
+++ b/references/yoga_rules.json
@@ -1278,8 +1278,8 @@
       "category": "auspicious",
       "logic": {
         "type": "custom",
-        "expr": "\nlord_5 = lord(5)\nlord_6 = lord(6)\nif lord_5 in ctx.planets and lord_6 in ctx.planets:\n    l5h = house_of(lord_5)\n    l6h = house_of(lord_6)\n    (kendra(l5h) or trikona(l5h)) and (kendra(l6h) or trikona(l6h))\nelse:\n    False\n",
-        "combo_template": "5宫主与6宫主均在有力宫位"
+        "expr": "\n# PyJHora/BVR-12: (L1 strong and L5/L6 in mutual kendras) OR\n# (L1 and L10 together in a movable sign and L9 strong).\nl1, l5, l6, l9, l10 = [lord(h) for h in [1, 5, 6, 9, 10]]\nif not all(p in ctx.planets for p in [l1, l5, l6, l9, l10]):\n    False\nelse:\n    l1h, l5h, l6h, l9h, l10h = [house_of(p) for p in [l1, l5, l6, l9, l10]]\n    cond1 = strong(l1) and offset(l5h, l6h) in [0, 3, 6, 9] and offset(l6h, l5h) in [0, 3, 6, 9]\n    cond2 = strong(l9) and same_house(l1, l10) and movable_house(l1h)\n    cond1 or cond2\n",
+        "combo_template": "上升主强且5/6宫主互为Kendra，或1/10宫主合于变动星座且9宫主强"
       },
       "effects": [
         "学识渊博",
@@ -1386,8 +1386,8 @@
       "category": "auspicious",
       "logic": {
         "type": "custom",
-        "expr": "\nben_in_trikona = [p for p in BENEFICS if p in ctx.planets and house_of(p) in [5, 9]]\nmal_in_dusthana = [p for p in MALEFICS if p in ctx.planets and house_of(p) in [6, 8]]\nbool(ben_in_trikona and mal_in_dusthana)\n",
-        "combo_template": "吉星在三方宫+凶星在凶宫"
+        "expr": "\n# PyJHora/PVR method=2: benefics only in Lagna and 9th; 5th contains\n# both benefic and malefic; 4th and 8th contain only malefics.\ncond1 = only_benefics_in_house(1) and only_benefics_in_house(9)\ncond2 = house_has_benefic(5) and house_has_malefic(5)\ncond3 = only_malefics_in_house(4) and only_malefics_in_house(8)\ncond1 and cond2 and cond3\n",
+        "combo_template": "Lagna/9宫仅吉星，5宫吉凶同在，4/8宫仅凶星"
       },
       "effects": [
         "聪慧过人",
@@ -9081,8 +9081,8 @@
       "category": "health",
       "logic": {
         "type": "custom",
-        "expr": "\n# PyJHora BVR-11: (a) Lagna lord in Lagna joined by dusthana lord;\n# (b) weak Lagna lord in kendra/trikona joined by a kendra/trine lord.\nasc_lord = lord(1)\ndusthana_lords = [lord(h) for h in [6, 8, 12]]\nquad_trine_lords = [lord(h) for h in [1, 4, 5, 7, 9, 10]]\nif asc_lord not in ctx.planets:\n    False\nelse:\n    h = house_of(asc_lord)\n    condition_a = h == 1 and any(dl in ctx.planets and same_house(asc_lord, dl) for dl in dusthana_lords)\n    condition_b = (kendra(h) or trikona(h)) and not strong(asc_lord) and any(qtl in ctx.planets and same_house(asc_lord, qtl) for qtl in quad_trine_lords if qtl != asc_lord)\n    condition_a or condition_b\n",
-        "combo_template": "上升主与凶宫主或角/三方主形成疾病格局"
+        "expr": "\n# PyJHora BVR-11 exact D1-safe logic: (a) Lagna lord in Lagna joined by\n# dusthana lord; (b) weak Lagna lord joined by any kendra/trine lord.\nasc_lord = lord(1)\ndusthana_lords = [lord(h) for h in [6, 8, 12]]\nquad_trine_lords = [lord(h) for h in [1, 4, 5, 7, 9, 10]]\nif asc_lord not in ctx.planets:\n    False\nelse:\n    condition_a = house_of(asc_lord) == 1 and any(dl in ctx.planets and same_house(asc_lord, dl) for dl in dusthana_lords)\n    condition_b = (not strong(asc_lord)) and any(qtl in ctx.planets and same_house(asc_lord, qtl) for qtl in quad_trine_lords)\n    condition_a or condition_b\n",
+        "combo_template": "上升主在Lagna合凶宫主，或弱上升主合角/三方主"
       },
       "effects": [
         "疾病",
@@ -11236,14 +11236,9 @@
       "bvr_id": null,
       "category": "putra",
       "logic": {
-        "type": "compound_conditions",
-        "conditions": [
-          {
-            "type": "5th_lord_afflicted_by_saturn_or_rahu",
-            "note": "5th lord afflicted by Saturn or Rahu"
-          }
-        ],
-        "note": "Loss of children at specific times"
+        "type": "custom",
+        "expr": "\n# PyJHora 229/230 D1-safe logic. Variant 229: Rahu in 5th, L5 joined\n# malefic, Jupiter debilitated. Variant 230: malefics occupy/aspect both\n# 5th from Lagna and 5th from Jupiter.\nl5 = lord(5)\nif l5 not in ctx.planets or 'Jupiter' not in ctx.planets:\n    False\nelse:\n    cond229 = house_of('Rahu') == 5 and debil('Jupiter') and any(m in ctx.planets and same_house(l5, m) for m in MALEFICS if m != l5)\n    j5 = ((house_of('Jupiter') - 1 + 4) % 12) + 1\n    mal_lagna5 = any(m in ctx.planets and (house_of(m) == 5 or aspects_house(m, 5)) for m in MALEFICS)\n    mal_jupiter5 = any(m in ctx.planets and (house_of(m) == j5 or aspects_house(m, j5)) for m in MALEFICS)\n    cond229 or (mal_lagna5 and mal_jupiter5)\n",
+        "combo_template": "Rahu/L5/木星或凶星影响Lagna与木星起算第5宫"
       },
       "effects": [
         "Loss of progeny at predetermined periods"
@@ -11631,32 +11626,9 @@
       "bvr_id": null,
       "category": "special",
       "logic": {
-        "type": "compound_conditions",
-        "conditions": [
-          {
-            "type": "compound",
-            "operator": "OR",
-            "conditions": [
-              {
-                "type": "jupiter_in_lagna_mars_in_7th",
-                "note": "Jupiter in Lagna and Mars in 7th"
-              },
-              {
-                "type": "saturn_in_lagna_mars_in_5_7_9",
-                "note": "Saturn in Lagna and Mars in 9th/5th/7th"
-              },
-              {
-                "type": "saturn_in_12th_with_waning_moon",
-                "note": "Saturn in 12th with waning Moon"
-              },
-              {
-                "type": "moon_mercury_in_kendra_with_planet",
-                "note": "Moon and Mercury in kendra with another planet"
-              }
-            ]
-          }
-        ],
-        "note": ""
+        "type": "custom",
+        "expr": "\n# PyJHora 291/292/294 D1-safe variants. Variant 293 needs tithi/waning Moon\n# and remains unavailable from static planet_positions_60 data.\njm = 'Jupiter' in ctx.planets and 'Mars' in ctx.planets and house_of('Jupiter') == 1 and house_of('Mars') == 7\nsm = 'Saturn' in ctx.planets and 'Mars' in ctx.planets and house_of('Saturn') == 1 and house_of('Mars') in [5, 7, 9]\nmoon_mercury = False\nif 'Moon' in ctx.planets and 'Mercury' in ctx.planets:\n    moon_mercury = kendra(house_of('Moon')) and kendra(house_of('Mercury')) and any(p != 'Moon' and aspect(p, 'Moon') for p in ctx.planets) and any(p != 'Mercury' and aspect(p, 'Mercury') for p in ctx.planets)\njm or sm or moon_mercury\n",
+        "combo_template": "木火1/7、土升火5/7/9，或月水角宫并受相位"
       },
       "effects": [
         "Mental disturbance, confusion, erratic behavior"
@@ -13633,18 +13605,9 @@
       "bvr_id": null,
       "category": "raja",
       "logic": {
-        "type": "compound_conditions",
-        "conditions": [
-          {
-            "type": "planets_in_mutual_kendras_or_conjunction",
-            "planets": [
-              "Jupiter",
-              "Mars"
-            ],
-            "note": "Jupiter and Mars in mutual kendras or in conjunction"
-          }
-        ],
-        "note": "Jupiter and Mars in mutual kendras or conjunction"
+        "type": "custom",
+        "expr": "\n# PyJHora: Jupiter and Mars are together or in the 7th from each other.\n'Jupiter' in ctx.planets and 'Mars' in ctx.planets and offset(house_of('Jupiter'), house_of('Mars')) in [0, 6]\n",
+        "combo_template": "木星与火星同宫或互为7宫"
       },
       "effects": [
         "Courage, wisdom, leadership, military success"
diff --git a/scripts/validate_logic_v2.py b/scripts/validate_logic_v2.py
index a66f2a50..c81ed086 100644
--- a/scripts/validate_logic_v2.py
+++ b/scripts/validate_logic_v2.py
@@ -96,7 +96,7 @@ PYJHORA_VARIANTS = {
     # Kedara
     'kedara_yoga': 'bvr_kedaara_yoga',
     # Kaahala/Kahala
-    'kaahala_yoga': 'bvr_kahala_yoga',
+    'kaahala_yoga': 'kahala_yoga',
     # Direct mappings for common yogas
     'vosi_yoga': 'bvr_vosi_precise',
     'sunaphaa_yoga': 'bvr_sunaphaa_precise',
diff --git a/scripts/yoga_engine.py b/scripts/yoga_engine.py
index 969d50b1..45440bdf 100644
--- a/scripts/yoga_engine.py
+++ b/scripts/yoga_engine.py
@@ -44,6 +44,7 @@ PLANET_CN = {
 }
 BENEFICS = ['Jupiter', 'Venus', 'Mercury', 'Moon']
 MALEFICS = ['Mars', 'Saturn', 'Sun', 'Rahu', 'Ketu']
+MOVABLE_SIGNS = ['Aries', 'Cancer', 'Libra', 'Capricorn']
 ALL_PLANETS = ['Sun', 'Moon', 'Mars', 'Mercury', 'Jupiter', 'Venus', 'Saturn', 'Rahu', 'Ketu']
 
 
@@ -921,6 +922,31 @@ class YogaEngine:
             # PyJHora temporary friends: 2/3/4/10/11/12 from a planet.
             return offset(ctx.house_of(a), ctx.house_of(b)) in [1, 2, 3, 9, 10, 11]
 
+        def occupants(h):
+            return ctx.planets_in_house(h) if h is not None else []
+
+        def only_benefics_in_house(h):
+            ps = occupants(h)
+            return bool(ps) and all(p in BENEFICS for p in ps)
+
+        def only_malefics_in_house(h):
+            ps = occupants(h)
+            return bool(ps) and all(p in MALEFICS for p in ps)
+
+        def house_has_benefic(h):
+            return any(p in BENEFICS for p in occupants(h))
+
+        def house_has_malefic(h):
+            return any(p in MALEFICS for p in occupants(h))
+
+        def house_sign(h):
+            if h is None:
+                return None
+            return SIGNS[(ctx.asc_idx + h - 1) % 12]
+
+        def movable_house(h):
+            return house_sign(h) in MOVABLE_SIGNS
+
         def exal(p): return ctx.is_exalted(p)
         def lord_of_house(h): return ctx.lord_of_house(h)
         def sign(p): return ctx.sign_of(p)
@@ -955,6 +981,7 @@ class YogaEngine:
             "SIGNS": SIGNS, "SIGN_LORDS": SIGN_LORDS,
             "EXALTATION": EXALTATION, "DEBILITATION": DEBILITATION,
             "PLANET_CN": PLANET_CN, "BENEFICS": BENEFICS, "MALEFICS": MALEFICS,
+            "MOVABLE_SIGNS": MOVABLE_SIGNS,
             "ALL_PLANETS": ALL_PLANETS, "MOOLATRIKONA_SIGN": MOOLATRIKONA_SIGN,
             # 基础查询
             "house_of": house_of, "sign_of": sign_of, "deg_of": deg_of,
@@ -977,6 +1004,10 @@ class YogaEngine:
             # v6.0.32: 同宫与相位检查（custom规则常用）
             "same_house": same_house, "aspect": aspect, "aspects_house": aspects_house,
             "strong": strong, "associated": associated, "temporal_friend": temporal_friend,
+            "occupants": occupants, "only_benefics_in_house": only_benefics_in_house,
+            "only_malefics_in_house": only_malefics_in_house,
+            "house_has_benefic": house_has_benefic, "house_has_malefic": house_has_malefic,
+            "house_sign": house_sign, "movable_house": movable_house,
             "exal": exal, "lord_of_house": lord_of_house, "sign": sign,
             "check_amala_from": check_amala_from,
             "Benefics": BENEFICS, "Malefics": MALEFICS,