Fixed improper location lock, removed search entirely.