Inproved window search.