Modified expand_eav_filter to include value_object fields.