Fixes after refactor:

* Order list
* Don't use option for ID
* Use query.mapResult()