improved regex, moved rsid func to CardsParser