 * Fixed some sorting and thumbnail related issues
