Additional logic for separate types
Merge branch '#30414#Change_filter_on_helpdesk' into dev