added patches of using native escape functions