Fix generic map filter