*. Add set order by amount and date