Escape column names correctly

It turns out we forgot to escape column names. 

This should fix things..