Further work on SolutionGenerator session selection logic