Add previous if-else to workflow filtering logic

Add previous if-else to workflow filtering logic #8170