Add metrics whitelisting, fix review comment