*8014* Fixed base path encoding issues