Added a fix for when a ? is in an path