Fix filtering not being applied to the correct file
    
    A report via personal email indicated the FILTEREXP wasn't working.
    Could reproduce and found that the filter was being applied to the wrong
    filename.  This may have crept in with one of the recent big code
    reorganizations.
    
    In any case, it should be fixed now.