Add Ordering as well as filtering