Clean-up subject matching feature, add options on plugin config page