Use path.join (forgot why did it the old way...)
Strip out query strings from dest paths