Improving mapping for indexes and added 'multi_field' for each property