cleaning up ability to query
dealing with encoding issues
changing contract for URL