Adds filtering based on available_fields in stream def