Merge Nelsonh's fix_filtering branch into main #289

Closed EttyKitty closed 7 months ago