Fix: Usage of order into export broken when filters are used