Before changing to variable search cols
Some changes