Maintain environment in Problem only. Fix search.