Minor cleanup RE: Pippin
Escape URLs