diff --git a/entity/Organisation_entity/Organisation_entity.aod b/entity/Organisation_entity/Organisation_entity.aod
index 076fe1f6213c28183ea068723d42855cd05d09c4..3c28665b6f4dafd38a997021fa55dd2fca257d70 100644
--- a/entity/Organisation_entity/Organisation_entity.aod
+++ b/entity/Organisation_entity/Organisation_entity.aod
@@ -1807,6 +1807,9 @@
           <indexFieldType>ADDRESS</indexFieldType>
           <isGlobalSearchField v="false" />
         </indexRecordFieldMapping>
+        <indexRecordFieldMapping>
+          <name>PICTURE.value</name>
+        </indexRecordFieldMapping>
       </indexFieldMappings>
     </indexRecordContainer>
   </recordContainers>
diff --git a/entity/Organisation_entity/recordcontainers/index/query.js b/entity/Organisation_entity/recordcontainers/index/query.js
index e26250598edb296c39f96f355d82fae6f096a7df..c2b15cd1890eac332871fee390b5c4137359adec 100644
--- a/entity/Organisation_entity/recordcontainers/index/query.js
+++ b/entity/Organisation_entity/recordcontainers/index/query.js
@@ -42,7 +42,7 @@ var querySelect = newSelect([
         sqlHelper.concatWithSeparator([sqlHelper.concatWithSeparator(["standardAddress.ADDRESS", "standardAddress.BUILDINGNO"])
             ,sqlHelper.concatWithSeparator(["standardAddress.COUNTRY", "standardAddress.ZIP", "standardAddress.CITY"])
         ], " - ")
-    ])
+    , "ORGANISATION.PICTURE"])
     .from("ORGANISATION")
     .join("CONTACT", "CONTACT.ORGANISATION_ID = ORGANISATION.ORGANISATIONID and CONTACT.PERSON_ID is null")
     .leftJoin("ADDRESS", "standardAddress.ADDRESSID = CONTACT.ADDRESS_ID", "standardAddress")
diff --git a/entity/Person_entity/Person_entity.aod b/entity/Person_entity/Person_entity.aod
index ccb951171b001f5b1ed08cf8daa5368ae64d7990..4f35bc7bb946086e868b8c7c6c1ff54cd7dfd48d 100644
--- a/entity/Person_entity/Person_entity.aod
+++ b/entity/Person_entity/Person_entity.aod
@@ -1837,6 +1837,9 @@
           </additionalFieldNameAliases>
           <isMultiValued v="true" />
         </indexRecordFieldMapping>
+        <indexRecordFieldMapping>
+          <name>PICTURE.value</name>
+        </indexRecordFieldMapping>
       </indexFieldMappings>
     </indexRecordContainer>
   </recordContainers>
diff --git a/entity/Person_entity/recordcontainers/index/query.js b/entity/Person_entity/recordcontainers/index/query.js
index e5c704e81ad9981791035100cf08dade778bc713..61ec0a66cbf788e47523eaa832bedf9fcb12e562 100644
--- a/entity/Person_entity/recordcontainers/index/query.js
+++ b/entity/Person_entity/recordcontainers/index/query.js
@@ -38,7 +38,8 @@ var querySelect = newSelect([
         "ADDRESS.ZIP",
         "ADDRESS.CITY",
         "COMMUNICATION.ADDR",
-        "PHONE.ADDR" 
+        "PHONE.ADDR",
+        "PERSON.PICTURE"
     ])
     .from("PERSON")
     .join("CONTACT", "CONTACT.PERSON_ID = PERSON.PERSONID")