More updates to DW queries