Fix more empty-values bugs in Query impls.