diff --git a/entity/360Degree_entity/entityfields/organisationobjects/children/objecttype_param/valueProcess.js b/entity/360Degree_entity/entityfields/organisationobjects/children/objecttype_param/valueProcess.js
index 4df09cf5d2ea093a32fa4518f224f7d4bf6ff747..86503dcd7f316c24dd3b7e31d296e35802db29a4 100644
--- a/entity/360Degree_entity/entityfields/organisationobjects/children/objecttype_param/valueProcess.js
+++ b/entity/360Degree_entity/entityfields/organisationobjects/children/objecttype_param/valueProcess.js
@@ -1,4 +1,6 @@
 import("system.vars");
 import("system.result");
 
-result.object(["Salesproject", "Offer", "Order", "Contract", "Campaign", "SupportTicket"]);
\ No newline at end of file
+//No campaign, since a campaign can only be linked with a person. 
+//Even when all entries of persons are displayed in the organisation_entity: It's still nonsense to display campaigns per status.
+result.object(["Salesproject", "Offer", "Order", "Contract", "SupportTicket"]);
\ No newline at end of file
diff --git a/entity/Organisation_entity/entityfields/360degreeobjects/children/objectrowid_param/valueProcess.js b/entity/Organisation_entity/entityfields/360degreeobjects/children/objectrowid_param/valueProcess.js
index fec3c0746a5f73b8b6a4e2e917954aad5e54d24b..3080fcea47e69e82074e9a6a5d3b9951364aa7fe 100644
--- a/entity/Organisation_entity/entityfields/360degreeobjects/children/objectrowid_param/valueProcess.js
+++ b/entity/Organisation_entity/entityfields/360degreeobjects/children/objectrowid_param/valueProcess.js
@@ -2,10 +2,9 @@ import("Sql_lib");
 import("system.vars");
 import("system.result");
 
-var person_contactids = newSelect( "CONTACTID" )
-                     .from("CONTACT")
-                     .where("CONTACT.ORGANISATION_ID", vars.getString("$field.ORGANISATIONID"))
-                     .and("CONTACT.PERSON_ID is null")
-                     .arrayColumn();
+var contactids = newSelect( "CONTACTID" )
+        .from("CONTACT")
+        .where("CONTACT.ORGANISATION_ID", vars.getString("$field.ORGANISATIONID"))
+        .arrayColumn();
 
-result.string( JSON.stringify([vars.getString("$field.CONTACTID")].concat(person_contactids)) );
\ No newline at end of file
+result.string( JSON.stringify(contactids) );
\ No newline at end of file
diff --git a/neonView/360DegreeFilter_view/360DegreeFilter_view.aod b/neonView/360DegreeFilter_view/360DegreeFilter_view.aod
index 2a908ab94a429e23177a6e1bb1f87c1f82d90089..964ace654b1a54b364f0aee87785b57ed896fecb 100644
--- a/neonView/360DegreeFilter_view/360DegreeFilter_view.aod
+++ b/neonView/360DegreeFilter_view/360DegreeFilter_view.aod
@@ -25,6 +25,7 @@
       <dateField>DATE</dateField>
       <titleField>TITLE</titleField>
       <descriptionField>ENTITY_NAME</descriptionField>
+      <iconIdField>ICON</iconIdField>
       <entityField>#ENTITY</entityField>
     </timelineViewTemplate>
   </children>