Updates for auto-escape feature