Added more emoji support, it works this time