Relocation of query builder