additionally replace manage_results for correct context.
Merge pull request #1335 from veroc/3515_2

additionally replace manage_results for correct context.