DRY up handling of entry sets between Analyze and Manual Edit. Also move entityGroups add out of loop for Manual handling.