*Fixed DO-4885 collection count in popup is not correct
*more changes on DO-4885
Merge pull request #510 from cyrilraja/master

*Fixed DO-4885 collection count in popup is not correct