Fix input to mapper, textpair -> text
Fix TextPair.toString