Case 2479 - Fixed HTML and JS.
Merge branch 'case-2479' into develop

* case-2479:
  Case 2479 - Fixed HTML and JS.