[RFR] Fixed entry point when an URL is given