Search Fix
Trying to get even faster!