- added evaluators for queries