Add fields to query parser