Revert 5e0c342..2fdcde0

This rolls back to commit 5e0c342748fbbda24008e2c87f7ed487ed17011d.
find bug

find bug that array should use for vars their names not *Terms, will
return to last version and start to repair