Make blacklist show currently checked options, cleanup some code