Added search for WX map, other minor changes.