Better emoji handling