Force enclosing of all columns with optional switch