KRACOEUS-7117:changed value finder to disable instead of remove illegal ...

changed the value finder to incorporate @blackcathacker suggestions, from pr 581