Fix top level drag and drop and saveExpandState