CDB-3980 Fixed for public dashboard, datasets and sitemap