GTNPORTAl-3200 Fix JS variables and decode in client