Fix whitelisting issues

Review: http://codereview.adblockplus.org/6227976249147392/