try to fix escaping in query - minor2