- BZ-1020915: fixing column ordering