fixed some searching