Fixed value list behaviour and also did some tidy up on variable extract method based on the new contract.