Fixes, separating the URL into <url> and <folder> broke a lot of things