Merge "Fix WEB_SEARCH handler whitelist"