Ok, added the former.

Also just a note that I made sure _ was a safe thing to use as a human-readable replacement for %20/space. Cleaned up a bunch of erroneous data for that and a couple other unusual shouldn't-really-be-in-any-creator-field chars like back-ticks and carets and such.

The main thrust was that people might be more inclined to plop a link like this somewhere instead of using a qr code, so the shorter and less url-y the better.