Issue #358 - fix restoreOrder function for question groups