Local folder refactoring, part 3
Local folder refactoring, part 4 (search temp. disabled)