Strong link validation

@ikhattab merge this