Added silly quote escaping for more problematic queries