Update 2.0 branch with fix for FILTERFILEURL

Comment in the commit is wrong due to copy/paste error, this is a fix for the 2.0 code rather than the 1.8 code. Same issue though, #1565.