Fixed multiple expansion links issue