diff --git a/lib/auth-tokens.js b/lib/auth-tokens.js
index d42fa1b1..30d9c389 100644
--- a/lib/auth-tokens.js
+++ b/lib/auth-tokens.js
@@ -7,7 +7,7 @@ function createAuthToken (userID, type) {
   const token = crypto.randomBytes(32).toString('hex')
   const sql = `INSERT INTO auth_tokens (token, type, user_id) VALUES ($1, $2, $3) ON CONFLICT (user_id, type) DO UPDATE SET token=$1, expire=now() + interval '${constants.AUTH_TOKEN_EXPIRATION_TIME}' RETURNING *`
 
-  return db.one(sql, [token, type, userID])
+  return db.$one(sql, [token, type, userID])
 }
 
 module.exports = {
diff --git a/lib/compute-schema.js b/lib/compute-schema.js
index e072c3b9..00b6d332 100644
--- a/lib/compute-schema.js
+++ b/lib/compute-schema.js
@@ -1,9 +1,7 @@
-const { asyncLocalStorage } = require('./async-storage')
+const { asyncLocalStorage, defaultStore } = require('./async-storage')
 
 const computeSchema = (req, res, next) => {
-  const store = new Map()
-  store.set('schema', 'public')
-  store.set('defaultSchema', 'ERROR_SCHEMA')
+  const store = defaultStore()
   asyncLocalStorage.run(store, () => {
     next()
   })
diff --git a/lib/new-settings-loader.js b/lib/new-settings-loader.js
index 250d57d3..6dfc3892 100644
--- a/lib/new-settings-loader.js
+++ b/lib/new-settings-loader.js
@@ -25,7 +25,7 @@ function saveAccounts (accounts) {
   return loadAccounts()
     .then(currentAccounts => {
       const newAccounts = _.merge(currentAccounts, accounts)
-      return db.none(accountsSql, ['accounts', { accounts: newAccounts }, true, NEW_SETTINGS_LOADER_SCHEMA_VERSION])
+      return db.$none(accountsSql, ['accounts', { accounts: newAccounts }, true, NEW_SETTINGS_LOADER_SCHEMA_VERSION])
     })
 }
 function resetAccounts (schemaVersion) {
diff --git a/lib/notifier/queries.js b/lib/notifier/queries.js
index af3f262b..e418bc98 100644
--- a/lib/notifier/queries.js
+++ b/lib/notifier/queries.js
@@ -59,7 +59,7 @@ const getNotifications = () => {
 }
 const setRead = (id, read) => {
   const sql = `UPDATE notifications SET read = $1 WHERE id = $2`
-  return db.none(sql, [read, id]).catch(console.error)
+  return db.$none(sql, [read, id]).catch(console.error)
 }
 
 const markAllAsRead = () => {
diff --git a/lib/routes.js b/lib/routes.js
index 9b062a22..fd353137 100644
--- a/lib/routes.js
+++ b/lib/routes.js
@@ -9,7 +9,6 @@ const authorize = require('./middlewares/authorize')
 const errorHandler = require('./middlewares/errorHandler')
 const filterOldRequests = require('./middlewares/filterOldRequests')
 const computeSchema = require('./compute-schema')
-const dbErrorCodes = require('./db-error-codes')
 const logger = require('./logger')
 const options = require('./options')
 const findOperatorId = require('./middlewares/operatorId')
diff --git a/lib/session-manager.js b/lib/session-manager.js
index 3785c576..77bf4d1c 100644
--- a/lib/session-manager.js
+++ b/lib/session-manager.js
@@ -2,7 +2,7 @@ const db = require('./db')
 
 function getSessions () {
   const sql = `SELECT * FROM user_sessions ORDER BY sess -> 'user' ->> 'username'`
-  return db.any(sql)
+  return db.$any(sql)
 }
 
 function getLastSessionPerUser () {
@@ -16,27 +16,27 @@ function getLastSessionPerUser () {
     SELECT DISTINCT ON (username)
     username, role
     FROM users) b ON a.username = b.username`
-  return db.any(sql)
+  return db.$any(sql)
 }
 
 function getSessionsByUsername (username) {
   const sql = `SELECT * FROM user_sessions WHERE sess -> 'user' ->> 'username'=$1`
-  return db.any(sql, [username])
+  return db.$any(sql, [username])
 }
 
 function getSessionById (sessionID) {
   const sql = `SELECT * FROM user_sessions WHERE sid=$1`
-  return db.any(sql, [sessionID])
+  return db.$any(sql, [sessionID])
 }
 
 function deleteSessionsByUsername (username) {
   const sql = `DELETE FROM user_sessions WHERE sess -> 'user' ->> 'username'=$1`
-  return db.none(sql, [username])
+  return db.$none(sql, [username])
 }
 
 function deleteSessionById (sessionID) {
   const sql = `DELETE FROM user_sessions WHERE sid=$1`
-  return db.none(sql, [sessionID])
+  return db.$none(sql, [sessionID])
 }
 
 module.exports = { getSessions, getLastSessionPerUser, getSessionsByUsername, getSessionById, deleteSessionsByUsername, deleteSessionById }