prevent empty URLs to be loaded
Merge branch 'DataLoadingUI'