Adding some code that adds an evaluation id to the evaluation context, and ensures that joining against idsets in the database is done within a particular context.