diff --git a/deploy_ai_search/rag_documents.py b/deploy_ai_search/rag_documents.py
index f971183..dba2645 100644
--- a/deploy_ai_search/rag_documents.py
+++ b/deploy_ai_search/rag_documents.py
@@ -217,12 +217,13 @@ def get_index_projections(self) -> SearchIndexerIndexProjections:
             ),
             InputFieldMappingEntry(
                 name="Figures",
+                source_context="/document/pages/*/figures/*",
                 inputs=[
                     InputFieldMappingEntry(
-                        name="FigureID", source="/document/pages/*/figures/figureId"
+                        name="FigureId", source="/document/pages/*/figures/*/figureId"
                     ),
                     InputFieldMappingEntry(
-                        name="FigureUri", source="/document/pages/*/figures/figureUri"
+                        name="FigureUri", source="/document/pages/*/figures/*/figureUri"
                     ),
                 ],
             ),