Issue 21054: More changes to fix edit issues with filters