order filtering working.
Merge branch 'Filtering-start'