Added custom filter and order
Conflict resolved