- rearranged the order of condition wql parser