WIP, add the right analyzer on fields mapping!