BISERVER-10264 - not keeping selections (Source Type,
Connection, Reporting Option) - code cleanup