CON-1709 | simple JS handling of the behavoiur