Updated selection switching to clear existing visible markers