Fixed ordering issues in extra fields  and extra fields groups lists .