Fix visit pattern, add sanitize-filename