Totally agree. Also probably another that could be remedied if we switched from strings to curl's. For now perhaps modify GetFilename/GetDirectory to handle this?