Properly escape new lines -- Related to #2021
Update a comment for clean_query
Merge branch 'michel_2021_newline' into next