UHM-1050 Refactor service type filter and add message properties for filters