real time count update works
Merge remote-tracking branch 'origin/eHealth_production' into eHealth_production