Ported apostrophe escape in text search back into s1 series
Merge branch 'query_with_apostrophe'