Add ability to select query solution.