Product attributes fixes