Fix saving of empty component selection