Fix to allow any URL structure