Slightly improve entity blacklist, make it accept entity names too