Add filter hints & unknown types