Fix #3866 Firewall Log Filtering

on 2.1 branch