Refactorings and fixes of the 'per query-mix execution' functionality.