fixed urls and encoding