Fixing sorting, fixing album images.