Cleaned up some Parse Issues

Found that the new workaround did not like the post ‘?’ bit of the URL,
so substringed it out.  Also removed reference to yql as it was oddly
unreliable.