Short text improvements