Fix accidentally global js variables
PIM-2331 Fix column form listener with string ids
Merge branch 'master' into PIM-2287