Fix tests (some commuities allowed custom fields)
Fix hopefully last broken test
Merge branch 'develop' into checkbox-filter
Remove addressable