Improve checkbox reset