Commit write-safe change from _querysafety