Fix the column order
Added queries