Merge "Sanitize paths before query"