DG: Fixed # of entries issues (REF-384)