Fix calls to combine.py to adjust to changes
Admit longer filter names