Fix credit card flag detection

Include some exclusive cases in flag detection