Resolve issues 161-165 Closes #165, #164, #163, #162, and #161 See merge request grp-fidentis/analyst2!180