Renamed URI to URL
Some fixes for Xincludes