diff --git a/AIAdvisor/skills/solr-opensearch-migration-advisor/steering/incompatibilities.md b/AIAdvisor/skills/solr-opensearch-migration-advisor/steering/incompatibilities.md
index 672920641b..f9ca6c0f58 100644
--- a/AIAdvisor/skills/solr-opensearch-migration-advisor/steering/incompatibilities.md
+++ b/AIAdvisor/skills/solr-opensearch-migration-advisor/steering/incompatibilities.md
@@ -14,3 +14,4 @@
 - Custom Request Handlers: No direct equivalent; must rebuild using standard Search API + Client-side logic.
 - Search Components: No equivalent; logic must be moved to the client or a custom OpenSearch plugin.
 - Solr Power: No equivalent; use standard OpenSearch feature set.
+- Querqy: The Solr query rewriting plugin has an OpenSearch equivalent — [Querqy for OpenSearch](https://github.com/querqy/querqy-opensearch). Migration requires installing the plugin and converting rewriter configs. Flag this as a critical dependency when detected (e.g. querqy JARs in lib/, QuerqyRewriterRequestHandler in solrconfig.xml).
diff --git a/AIAdvisor/skills/solr-opensearch-migration-advisor/steering/index_design.md b/AIAdvisor/skills/solr-opensearch-migration-advisor/steering/index_design.md
index 3d54a9a907..5b7c7be35f 100644
--- a/AIAdvisor/skills/solr-opensearch-migration-advisor/steering/index_design.md
+++ b/AIAdvisor/skills/solr-opensearch-migration-advisor/steering/index_design.md
@@ -15,6 +15,12 @@
 - `solr.DateField` → `date`.
 - `solr.BoolField` → `boolean`.
 
+## Output Format
+- Always include a complete, valid OpenSearch index mapping as a JSON code block.
+- The JSON mapping must be copy-pasteable into a `PUT /<index>` request body.
+- Do not describe field mappings only in prose — the JSON mapping is the primary deliverable.
+- Annotate the JSON with comments or follow-up prose explaining non-obvious type decisions.
+
 ## Analysis
 - Solr Tokenizers/Filters → OpenSearch Analysers/Tokenizers/Filters.
 - `copyField` → `copy_to`.