whitelisting option, various fine-tuning