fix some album logic and post sort.