updated search (still not fixed)