better emote modification handling