National: substituted my previous commit by a different approach (javascript corrections).