<DA-328-fix-count> fix more new entry count
<unstable> Merge branch 'DA-328-fix-count' into unstable