Search Logic optimized (Search restart in Main-Project)