Fix inclusion order
Fix saving for completed items