Finish converting disk_windows to CreateQuery