Issue #3423993 by joseph.olstad, sandipta: Js file name is wrong and improvements to js logic is required
Closes #3423993