Fix performance issues while search noms