Changes to local search stuff