Fixed dw query creation (combination issue)