feature: Add more advanced filtering