Replaced text field with list box and changed label
Improved label text
Merge branch 'report-template-selection-SOAP-279' into next