lookup refactor, delete own query builder - change to DBAL