EHO-369 The filter was ignored after changing the sort order