1. FIXED: Determinism for BGP generating rules.
2. FIXED: Additional brackets for certain filter expressions.