Fix ANR + add formater for amex