save unneeded network requests; more restricted whitelisting