Imported query evaluation from client project
For #8-eval-to-store
Simplified and clarified the custom evaluation code
For #8-eval-to-store