Relocation of Query Builder