fixed collection editing issues