Improvements, optimizations and troubleshooting:

* Fix crash when using sorts in a folder view