fix #21246, other fixes for text