Re-add filtering for multiple matches on one line