Add method to update map with search; various improvements