Improve ordering on trash can. Fixes #8