Issue #1620 - Make dataset link mandatory