Better handling of terminators in text2
Sort by score