Added space handling in URLs / replacing with underscores