diff --git a/src/client/reducers/sampo/finds.js b/src/client/reducers/sampo/finds.js
index 883e3a65e9bc3ec9d6c7597d18aaf7d4ba182b3e..e516a116a837340d2718b86a3717802c4ed8fd42 100644
--- a/src/client/reducers/sampo/finds.js
+++ b/src/client/reducers/sampo/finds.js
@@ -94,43 +94,43 @@ export const INITIAL_STATE = {
       sortValues: true,
       numberedList: false,
       minWidth: 180
+    },
+    {
+      id: 'startYear',
+      valueType: 'string',
+      makeLink: false,
+      externalLink: false,
+      sortValues: true,
+      numberedList: false,
+      minWidth: 180
+    },
+    {
+      id: 'endYear',
+      valueType: 'string',
+      makeLink: false,
+      externalLink: false,
+      sortValues: true,
+      numberedList: false,
+      minWidth: 180
+    },
+    {
+      id: 'earliestStart',
+      valueType: 'string',
+      makeLink: false,
+      externalLink: false,
+      sortValues: true,
+      numberedList: false,
+      minWidth: 180
+    },
+    {
+      id: 'latestEnd',
+      valueType: 'string',
+      makeLink: false,
+      externalLink: false,
+      sortValues: true,
+      numberedList: false,
+      minWidth: 180
     }
-    // {
-    //   id: 'startYear',
-    //   valueType: 'string',
-    //   makeLink: false,
-    //   externalLink: false,
-    //   sortValues: true,
-    //   numberedList: false,
-    //   minWidth: 180
-    // },
-    // {
-    //   id: 'endYear',
-    //   valueType: 'string',
-    //   makeLink: false,
-    //   externalLink: false,
-    //   sortValues: true,
-    //   numberedList: false,
-    //   minWidth: 180
-    // },
-    // {
-    //   id: 'earliestStart',
-    //   valueType: 'string',
-    //   makeLink: false,
-    //   externalLink: false,
-    //   sortValues: true,
-    //   numberedList: false,
-    //   minWidth: 180
-    // },
-    // {
-    //   id: 'latestEnd',
-    //   valueType: 'string',
-    //   makeLink: false,
-    //   externalLink: false,
-    //   sortValues: true,
-    //   numberedList: false,
-    //   minWidth: 180
-    // }
   ]
 }
 
diff --git a/src/client/reducers/sampo/findsFacets.js b/src/client/reducers/sampo/findsFacets.js
index 7ddd1088f7ad2757227c3b574dab850e3f2021cd..67075287f4271bce0af7d08edb3d1208f0f122cb 100644
--- a/src/client/reducers/sampo/findsFacets.js
+++ b/src/client/reducers/sampo/findsFacets.js
@@ -23,6 +23,25 @@ export const INITIAL_STATE = {
       uriFilter: null,
       priority: 1
     },
+    objectType: {
+      id: 'objectType',
+      // predicate: defined in backend
+      distinctValueCount: 0,
+      values: [],
+      flatValues: [],
+      sortBy: 'instanceCount',
+      sortDirection: 'desc',
+      sortButton: true,
+      spatialFilterButton: false,
+      pieChartButton: true,
+      isFetching: false,
+      searchField: true,
+      containerClass: 'ten',
+      filterType: 'uriFilter',
+      uriFilter: null,
+      type: 'hierarchical',
+      priority: 6
+    },
     // specification: {
     //   id: 'specification',
     //   // predicate: defined in backend
@@ -41,61 +60,61 @@ export const INITIAL_STATE = {
     //   uriFilter: null,
     //   priority: 2
     // },
-    type: {
-      id: 'type',
-      // predicate: defined in backend
-      distinctValueCount: 0,
-      values: [],
-      flatValues: [],
-      sortBy: 'instanceCount',
-      sortDirection: 'desc',
-      sortButton: true,
-      spatialFilterButton: false,
-      pieChartButton: true,
-      isFetching: false,
-      searchField: true,
-      containerClass: 'ten',
-      filterType: 'uriFilter',
-      uriFilter: null,
-      priority: 2
-    },
-    subCategory: {
-      id: 'subCategory',
-      // predicate: defined in backend
-      distinctValueCount: 0,
-      values: [],
-      flatValues: [],
-      sortBy: 'instanceCount',
-      sortDirection: 'desc',
-      sortButton: true,
-      spatialFilterButton: false,
-      pieChartButton: true,
-      isFetching: false,
-      searchField: true,
-      containerClass: 'ten',
-      filterType: 'uriFilter',
-      uriFilter: null,
-      priority: 3
-    },
-    objectSubCategory: {
-      id: 'objectSubCategory',
-      // predicate: defined in backend
-      distinctValueCount: 0,
-      values: [],
-      flatValues: [],
-      sortBy: 'instanceCount',
-      sortDirection: 'desc',
-      sortButton: true,
-      spatialFilterButton: false,
-      pieChartButton: true,
-      isFetching: false,
-      searchField: true,
-      containerClass: 'ten',
-      filterType: 'uriFilter',
-      uriFilter: null,
-      priority: 3
-      // type: 'hierarchical'
-    },
+    // type: {
+    //   id: 'type',
+    //   // predicate: defined in backend
+    //   distinctValueCount: 0,
+    //   values: [],
+    //   flatValues: [],
+    //   sortBy: 'instanceCount',
+    //   sortDirection: 'desc',
+    //   sortButton: true,
+    //   spatialFilterButton: false,
+    //   pieChartButton: true,
+    //   isFetching: false,
+    //   searchField: true,
+    //   containerClass: 'ten',
+    //   filterType: 'uriFilter',
+    //   uriFilter: null,
+    //   priority: 2
+    // },
+    // subCategory: {
+    //   id: 'subCategory',
+    //   // predicate: defined in backend
+    //   distinctValueCount: 0,
+    //   values: [],
+    //   flatValues: [],
+    //   sortBy: 'instanceCount',
+    //   sortDirection: 'desc',
+    //   sortButton: true,
+    //   spatialFilterButton: false,
+    //   pieChartButton: true,
+    //   isFetching: false,
+    //   searchField: true,
+    //   containerClass: 'ten',
+    //   filterType: 'uriFilter',
+    //   uriFilter: null,
+    //   priority: 3
+    // },
+    // objectSubCategory: {
+    //   id: 'objectSubCategory',
+    //   // predicate: defined in backend
+    //   distinctValueCount: 0,
+    //   values: [],
+    //   flatValues: [],
+    //   sortBy: 'instanceCount',
+    //   sortDirection: 'desc',
+    //   sortButton: true,
+    //   spatialFilterButton: false,
+    //   pieChartButton: true,
+    //   isFetching: false,
+    //   searchField: true,
+    //   containerClass: 'ten',
+    //   filterType: 'uriFilter',
+    //   uriFilter: null,
+    //   priority: 3,
+    //   //type: 'hierarchical'
+    // },
     material: {
       id: 'material',
       // predicate: defined in backend
@@ -115,42 +134,42 @@ export const INITIAL_STATE = {
       priority: 4,
       type: 'hierarchical'
     },
-    materialLiteral: {
-      id: 'materialLiteral',
-      // predicate: defined in backend
-      distinctValueCount: 0,
-      values: [],
-      flatValues: [],
-      sortBy: 'instanceCount',
-      sortDirection: 'desc',
-      sortButton: true,
-      spatialFilterButton: false,
-      pieChartButton: true,
-      isFetching: false,
-      searchField: true,
-      containerClass: 'ten',
-      filterType: 'uriFilter',
-      uriFilter: null,
-      priority: 4
-    },
-    period: {
-      id: 'period',
-      // predicate: defined in backend
-      distinctValueCount: 0,
-      values: [],
-      flatValues: [],
-      sortBy: 'instanceCount',
-      sortDirection: 'desc',
-      sortButton: true,
-      spatialFilterButton: false,
-      pieChartButton: true,
-      isFetching: false,
-      searchField: true,
-      containerClass: 'ten',
-      filterType: 'uriFilter',
-      uriFilter: null,
-      priority: 5
-    },
+    // materialLiteral: {
+    //   id: 'materialLiteral',
+    //   // predicate: defined in backend
+    //   distinctValueCount: 0,
+    //   values: [],
+    //   flatValues: [],
+    //   sortBy: 'instanceCount',
+    //   sortDirection: 'desc',
+    //   sortButton: true,
+    //   spatialFilterButton: false,
+    //   pieChartButton: true,
+    //   isFetching: false,
+    //   searchField: true,
+    //   containerClass: 'ten',
+    //   filterType: 'uriFilter',
+    //   uriFilter: null,
+    //   priority: 4,
+    // },
+    // period: {
+    //   id: 'period',
+    //   // predicate: defined in backend
+    //   distinctValueCount: 0,
+    //   values: [],
+    //   flatValues: [],
+    //   sortBy: 'instanceCount',
+    //   sortDirection: 'desc',
+    //   sortButton: true,
+    //   spatialFilterButton: false,
+    //   pieChartButton: true,
+    //   isFetching: false,
+    //   searchField: true,
+    //   containerClass: 'ten',
+    //   filterType: 'uriFilter',
+    //   uriFilter: null,
+    //   priority: 5
+    // },
     periodObject: {
       id: 'periodObject',
       // predicate: defined in backend
@@ -170,8 +189,8 @@ export const INITIAL_STATE = {
       type: 'hierarchical',
       priority: 6
     },
-    municipality: {
-      id: 'municipality',
+    place: {
+      id: 'place',
       // predicate: defined in backend
       distinctValueCount: 0,
       values: [],
@@ -186,6 +205,7 @@ export const INITIAL_STATE = {
       containerClass: 'ten',
       filterType: 'uriFilter',
       uriFilter: null,
+      type: 'hierarchical',
       priority: 6
     }
   }
diff --git a/src/server/sparql/sampo/sparql_queries/SparqlQueriesFinds.js b/src/server/sparql/sampo/sparql_queries/SparqlQueriesFinds.js
index 5596002b54e529f0ef161c0fd9cf876ef8490a5d..1791971eafa605acb4abdeb04fdd5a8d42889ea2 100644
--- a/src/server/sparql/sampo/sparql_queries/SparqlQueriesFinds.js
+++ b/src/server/sparql/sampo/sparql_queries/SparqlQueriesFinds.js
@@ -67,8 +67,8 @@ export const findPropertiesFacetResults =
     }
     UNION
     {
-      ?id :object_type ?objectSubCatecory__id.
-      ?objectSubCatecory___id skos:prefLabel ?objectSubCatecory___prefLabel .
+      ?id :object_type ?objectType__id.
+      ?objectType__id skos:prefLabel ?objectType__prefLabel .
     }
     UNION
     {