TRUNK-3860 Use filter instead of query parameters to eliminate duplicates