Fix duplicated Non Intrusive checkboxes

Change-Id: Ibad25534b90d1a9665fb588923c64d279a7f23ab