Improve datasource URL detection

[#60313156]
Merge 60313156-datasource-checks to master

[#60313156]