AI-685 - we need store set to correctly validate expression codes