Bug 15774: Fix additional fields filters