Fix column sorting