#8860: moved js code to organize.js