Bugfix for match filtering