Problem 1 - Refactor filter duplicates