improved album parsing