Adding check for boolean variables for option value clause