Better block interact whitelist handling