make auto-whitelist all safer by forcing a narrow scope