Fix to match the definition order of the columns between the DB tables and Go's struct