Continue fixing albumitem order