S67194: Update filtering popover complex types