Fixed URL updating when expanding