added generic fields to the parse_query_fields method