Emi - bugs fixed

Deployment version: 1.4.0.148