Change amex attr and fix cc type selector to be safer