Combine XACML into one FILTER for an edge case. Code review fixes.