fix selection due to restructure