Bug fixes + use percentage for match_policies instead of values