Update baseURI checking/pull and fallback, fixes #17661