changes to fix edit oneclick issues