Bug 15685: Fix DB columns order