CDB-2718 Fixed wrong counting in public map page
Merge CDB-2718 into release/2.13.1