adjust _DQuery to utilize the fix of 18524