Function "findWhere" update