Unified automatch settings

Fixes #229 and prevents #231 from happening if user sets owned-set automatch preference (see comments in #229 for more details).