Improvement and fix update

The previous version introduced a change that might have killed users blacklist. If such is the case please reset your settings to resume normal behavior.

This version contains improvement and fix for a bug included in the commit description.