AP merge - re utf8 in db and credit card fix