Fixes #5659 and other can edit issues for extender and annotations

This cleans up the can edit extender code to work like other can edit functionality