cleaned QueryExecutor