Fix default module highlight

Use subcategory model index to find the good module to update. Previous implementation worked for almost every case, but if you have different weight for submodules, updated module data was not the good one


(cherry picked from commit f42ea45e)