Bug fix get_fieldvalues_by_type