Fixed Filtering performance issues