Cleanup
Provide more useful feedback while and after sorting
Minor fixes to sorting and trash/spam exclusion in search