Update of HBBDataService - EmR, Ems update/fix