fix: removed duplicate filters / merge follow-up fixes

fix: removed duplicate filters / merge follow-up fixes #378