Fixed URLs in NameMapping to work like the ENCODEURI
On return from grant writing, going to rearrange SPIN rule running code