Implement more advanced filter strategy