Prepare QueryEvaluator for data cleansing toolkit
Code clean
Complete QueryExecutor class