FEND-1081: Filter by Article Type improvements Part 2