diff --git a/src/server/index.js b/src/server/index.js
index 1f94ca45ad8f5f45ed0deba9fa92f5969b2ee7af..d42f08683ad5dc7026450845be3daea008dd944c 100644
--- a/src/server/index.js
+++ b/src/server/index.js
@@ -1,4 +1,4 @@
-import { backendSearchConfig } from './sparql/sampo/BackendSearchConfig'
+// import { backendSearchConfig } from './sparql/sampo/BackendSearchConfig'
 import fs from 'fs'
 import express from 'express'
 import path from 'path'
@@ -6,7 +6,7 @@ import bodyParser from 'body-parser'
 import axios from 'axios'
 import { has, castArray } from 'lodash'
 import expressStaticGzip from 'express-static-gzip'
-// import { createBackendSearchConfig } from './sparql/Utils'
+import { createBackendSearchConfig } from './sparql/Utils'
 import {
   getResultCount,
   getPaginatedResults,
@@ -73,7 +73,7 @@ app.use(validator)
 app.post(`${apiPath}/faceted-search/:resultClass/paginated`, async (req, res, next) => {
   const { params, body } = req
   try {
-    // const backendSearchConfig = await createBackendSearchConfig()
+    const backendSearchConfig = await createBackendSearchConfig()
     const data = await getPaginatedResults({
       backendSearchConfig,
       resultClass: params.resultClass,
@@ -95,6 +95,7 @@ app.post(`${apiPath}/faceted-search/:resultClass/all`, async (req, res, next) =>
   const { params, body } = req
   const resultFormat = 'json'
   try {
+    const backendSearchConfig = await createBackendSearchConfig()
     const data = await getAllResults({
       backendSearchConfig,
       resultClass: params.resultClass,
@@ -124,6 +125,7 @@ app.post(`${apiPath}/faceted-search/:resultClass/all`, async (req, res, next) =>
 // GET endpoint for supporting CSV button
 app.get(`${apiPath}/faceted-search/:resultClass/all`, async (req, res, next) => {
   try {
+    const backendSearchConfig = await createBackendSearchConfig()
     const resultFormat = req.query.resultFormat == null ? 'json' : req.query.resultFormat
     const data = await getAllResults({
       backendSearchConfig,
@@ -149,7 +151,7 @@ app.get(`${apiPath}/faceted-search/:resultClass/all`, async (req, res, next) =>
 app.post(`${apiPath}/faceted-search/:resultClass/count`, async (req, res, next) => {
   const { params, body } = req
   try {
-    // const backendSearchConfig = await createBackendSearchConfig()
+    const backendSearchConfig = await createBackendSearchConfig()
     const data = await getResultCount({
       backendSearchConfig,
       resultClass: params.resultClass,
@@ -165,6 +167,7 @@ app.post(`${apiPath}/faceted-search/:resultClass/count`, async (req, res, next)
 app.post(`${apiPath}/:resultClass/page/:uri`, async (req, res, next) => {
   const { params, body } = req
   try {
+    const backendSearchConfig = await createBackendSearchConfig()
     const data = await getByURI({
       backendSearchConfig,
       resultClass: params.resultClass,
@@ -182,6 +185,7 @@ app.post(`${apiPath}/:resultClass/page/:uri`, async (req, res, next) => {
 app.post(`${apiPath}/faceted-search/:facetClass/facet/:id`, async (req, res, next) => {
   const { params, body } = req
   try {
+    const backendSearchConfig = await createBackendSearchConfig()
     const data = await getFacet({
       backendSearchConfig,
       facetClass: params.facetClass,
@@ -200,6 +204,7 @@ app.post(`${apiPath}/faceted-search/:facetClass/facet/:id`, async (req, res, nex
 
 app.get(`${apiPath}/full-text-search`, async (req, res, next) => {
   try {
+    const backendSearchConfig = await createBackendSearchConfig()
     const data = await queryJenaIndex({
       backendSearchConfig,
       queryTerm: req.query.q,
@@ -228,6 +233,7 @@ app.get(`${apiPath}/federated-search`, async (req, res, next) => {
     longMax = req.query.longMax
   }
   try {
+    const backendSearchConfig = await createBackendSearchConfig()
     const data = await getFederatedResults({
       federatedSearchDatasets: backendSearchConfig.federatedSearch.datasets,
       queryTerm,
@@ -358,6 +364,7 @@ app.get(`${apiPath}/wfs`, async (req, res, next) => {
 app.get(`${apiPath}/void/:resultClass`, async (req, res, next) => {
   const { params } = req
   try {
+    const backendSearchConfig = await createBackendSearchConfig()
     const data = await getAllResults({
       backendSearchConfig,
       resultClass: params.resultClass,
diff --git a/src/server/sparql/SparqlApi.js b/src/server/sparql/SparqlApi.js
index 701a12788e29b1a5011d1992effbef3fb0e96984..3e73ca4f78e0dff1793aaf2dfcafbd5e7f47ff28 100644
--- a/src/server/sparql/SparqlApi.js
+++ b/src/server/sparql/SparqlApi.js
@@ -22,11 +22,6 @@ export const runSelectQuery = async ({
     headers.Authorization = `Basic ${process.env.SPARQL_ENDPOINT_BASIC_AUTH}`
   }
   const q = querystring.stringify({ query })
-  // console.log('sparqling')
-  // console.log(resultFormat)
-  // console.log(q)
-  // console.log(endpoint)
-  // console.log(resultMapper)
   try {
     const response = await axios({
       method: 'post',
@@ -35,7 +30,6 @@ export const runSelectQuery = async ({
       data: q
     })
     if (resultFormat === 'json') {
-      // console.log(response)
       let mappedResults = resultMapperConfig
         ? resultMapper({ sparqlBindings: response.data.results.bindings, config: resultMapperConfig })
         : resultMapper(response.data.results.bindings)