Fix issue with leading/trailing spaces in column names