correct handling of Project ID for Amazon