Enhancements to AisFilter