Case 3649 - Fixed issues with filters.