Fixing SM list mechanism as it is checked against cr entries