AWS changes:
- sorting of loans
- couple of fixes