Move url encode to output method, rather than save