TEIIDDES-2269 Corrects WindowFunction handling