oops: Fix bad merge for list properties as sub-fields

This fixes the fields available in the drop-down in filter configuration. They show the sub-fields of the SelectionField configuration form rather than list property fields.

This also fixes a crash on new ticket if the organization form has a field that has properties.

Fixes #1308