Added emoji support on client side