#DGTF-863 now filter data to display, only display sererity type has value
Merge commit '0c0dfd75fad7ed4c48b20cedace5945d0c34b2a5' into HEAD