fix bugs on whiteList and enhance log messages