feature/us-93 -- minor tweaks prior to MSSQL DB in UAT