fixed issues raied during code review of adding blacklisting.