Fix issue with leading and trailing spaces in column names