Refactored AisFilter