Js dsc 1107

fixes most of dsc 1107
@JonathanShaw You could even create some kind of enum for the different cases that get passed to the view base don the Job Type? I guess it would be easier to change if the regex's where in one place and were not a huge if statement.