Thanks Charles, it's working now.

I'm deploying to production and confirming results soon.

Rogelio