Fixed URL expand bug