Fix path encoding issues
re-factor method name