Update collection UDF viewing and editing

Fixes #971
Fixes #972