Fix store_url breaks