CON-1654 | JavaScript separation