Bug fixes in QueryExecuter