encodage fixed / search function fixed
merge fix