AEF: fixed bugs by SKU