Revised emoji logic and data