Fixed ? not escaping properly