Search fix. A lot faster now !