WKS-212 remove subject
Use correct variables for the display
Merge branch 'feature/WKS-212' into develop