Fixed #18404 -- Encoded storage location with filesystem or default enco...

...ding

Thanks andkit for the initial patch