Change multiple fields to multi_field type and support sorting on them