Finish and Fix for blacklist management issue