Tidy-up
Whitespace
New fields for URL conversion
Update proxy controller to use new fields