Reduce number of queries
Reorder columns