unify the way we escape query