put query processor back in
get rid of legacy names; fix cross-chunk query bugs; still one more test case to fix