Js dsc 1107

fixes most of dsc 1107
I wonder if this should go into a config setting and get passed to the template?