Added evaluation draft.
Improved consistency between evaluation and manual queries.