minor fixes, url not escaped