Really fix SQL escaping this time