Add is CIDR / is not CIDR in location rules, closes #2655