Adding some escaping and fixing a bad URL