Cleaned up & fixed blacklist filter