Removed TODO comment from Query execution: code is as good as it can be for now