Better support of multivalued fields