UPDATE Search Feature

Cause first version was not correctly implemented. Works !