Update conditions on TextEntry
Fix sort_title and sort_name generation