Collection editing bugfixes