remove origname and filename condition, only use URI #3669

#3669