[MAGEMEP-120] Improving category mapping functionnality