Add Query option to CPUDB