Update to handle pesky filenames with uri. Should conclude ticket #534