Fix bugs with 2 flag names and not removing when leaving the area