And make it rewrites work properly when the source is not path matching