Enhance the behavior for the check to maintain the values even if we are adding new check

Reviewer: Tiff Go

Issue: None