BS-9592, fix context for expression evaluation, the wrong map was given