Re-add missing default and button fix
Merge branch 'collection-entry-options'

* collection-entry-options:
  Re-add missing default and button fix