Improve orderBy() and columns() functions